diff --git a/AUTHORS b/AUTHORS
index 464249d7102b40285a92018756e0588caf8d1125..be29dbbf2dde598506fe5f18d04ce608a6a02087 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -292,6 +292,7 @@ Shmuel Englard
 soliton4
 sonson
 spastorelli
+srajanpaliwal
 Stanislav Oaserele
 Stas Kobzar
 Stefan Borsje
diff --git a/doc/compress.html b/doc/compress.html
index e5a77c502296b6ac4020d4ce9ffc7f745e97aa79..cb1dfcc9e67ef9b509ac0ac5bf5add9666183924 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@
       <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
       <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px;">
         <option value="http://codemirror.net/">HEAD</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.2;f=">4.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.1;f=">4.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.22.0;f=">3.22</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.21.0;f=">3.21</option>
diff --git a/doc/manual.html b/doc/manual.html
index 50407bb001d730098362dc2991f090fabe2c234d..7450476361037fc3b84e49d854b07272e007f452 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -63,7 +63,7 @@
 <section class=first id=overview>
     <h2 style="position: relative">
       User manual and reference guide
-      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.0.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.0.2</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/doc/releases.html b/doc/releases.html
index 3e2932b4119e88f179147d40cc97a59107813299..0a2551984f8758fea145af2333314693c3e14250 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,7 +28,13 @@
 
   <h2>Version 4.x</h2>
 
-  <p class="rel">21-02-2014: <a href="http://codemirror.net/codemirror-4.0rc1.zip">Version 4.0 release candidate 1</a>:</p>
+  <p class="rel">17-03-2014: <a href="http://codemirror.net/codemirror-4.0rc2.zip">Version 4.0 release candidate 2</a>:</p>
+
+  <p class="rel-note">Second release candidate for 4.0. Fixes some
+  context menu bugs, a wheel-scrolling glitch, and several missing
+  cases in the Sublime Text bindings.</p>
+
+  <p class="rel">10-03-2014: <a href="http://codemirror.net/codemirror-4.0rc1.zip">Version 4.0 release candidate 1</a>:</p>
 
   <p class="rel-note">First release candidate for 4.0, which supports
   multiple selections, selection undo, and improved (faster, less
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5fd7efe58b5b29eafd7da5da8ca331a12d39f31a..e32bfe9b1f2ccd436ab53bc50f14467137392f35 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7325,7 +7325,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.0.1";
+  CodeMirror.version = "4.0.2";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 484f7cdc4df60d0ffd1336c23902686b2aa8af9e..7ee1d9e508cc2687c0bd26e6db46de0d036430dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.0.1",
+    "version":"4.0.2",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",