diff --git a/datasette/static/cm-editor-6.0.1.bundle.js b/datasette/static/cm-editor.bundle.js
similarity index 100%
rename from datasette/static/cm-editor-6.0.1.bundle.js
rename to datasette/static/cm-editor.bundle.js
diff --git a/datasette/static/cm-editor-6.0.1.js b/datasette/static/cm-editor.js
similarity index 100%
rename from datasette/static/cm-editor-6.0.1.js
rename to datasette/static/cm-editor.js
diff --git a/datasette/templates/_codemirror.html b/datasette/templates/_codemirror.html
index 75c16168..657f99ac 100644
--- a/datasette/templates/_codemirror.html
+++ b/datasette/templates/_codemirror.html
@@ -1,5 +1,5 @@
 <script src="{{ static('sql-formatter-2.3.3.min.js') }}" defer></script>
-<script src="{{ static('cm-editor-6.0.1.bundle.js') }}"></script>
+<script src="{{ static('cm-editor.bundle.js') }}"></script>
 <style>
   .cm-editor {
     resize: both;
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 692f94c8..21470f6e 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -434,13 +434,10 @@ Datasette bundles `CodeMirror <https://codemirror.net/>`__ for the SQL editing i
 
     npm i codemirror @codemirror/lang-sql
 
-* Build the bundle using the version number from package.json with::
+* Build the bundle with::
 
-    node_modules/.bin/rollup datasette/static/cm-editor-6.0.1.js \
-      -f iife \
-      -n cm \
-      -o datasette/static/cm-editor-6.0.1.bundle.js \
-      -p @rollup/plugin-node-resolve \
-      -p @rollup/plugin-terser
+    npm install && npm run build:codemirror
 
-* Update the version reference in the ``codemirror.html`` template.
+  This runs ``rollup -c`` against the ``rollup.config.mjs`` file at the root of the repository, which reads ``datasette/static/cm-editor.js`` and writes the bundled, minified output to ``datasette/static/cm-editor.bundle.js``. The bundle filename does not include the CodeMirror version number, so no template needs to be updated.
+
+* Commit the rebuilt ``datasette/static/cm-editor.bundle.js`` - the bundle is checked into the repository.
diff --git a/package.json b/package.json
index 4d4c3e0c..91335fb5 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
     "prettier": "^3.0.0"
   },
   "scripts": {
+    "build:codemirror": "rollup -c",
     "fix": "npm run prettier -- --write",
     "prettier": "prettier 'datasette/static/*[!.min|bundle].js'"
   },
diff --git a/rollup.config.mjs b/rollup.config.mjs
new file mode 100644
index 00000000..875b2822
--- /dev/null
+++ b/rollup.config.mjs
@@ -0,0 +1,12 @@
+import { nodeResolve } from "@rollup/plugin-node-resolve";
+import terser from "@rollup/plugin-terser";
+
+export default {
+  input: "datasette/static/cm-editor.js",
+  output: {
+    file: "datasette/static/cm-editor.bundle.js",
+    format: "iife",
+    name: "cm",
+  },
+  plugins: [nodeResolve(), terser()],
+};