diff --git a/AUTHORS b/AUTHORS
index b9bf72103c..9c271f9c43 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -50,6 +50,7 @@ Ankit Ahuja
 Ansel Santosa
 Anthony Grimes
 Anton Kovalyov
+AQNOUCH Mohammed
 areos
 as3boyan
 AtomicPages LLC
@@ -76,6 +77,7 @@ Brett Zamir
 Brian Grinstead
 Brian Sletten
 Bruce Mitchener
+Calin Barbat
 Chandra Sekhar Pydi
 Charles Skelton
 Cheah Chu Yeow
@@ -173,6 +175,7 @@ Hakan Tunc
 Hans Engel
 Hardest
 Hasan Karahan
+Hector Oswaldo Caballero
 Herculano Campos
 Hiroyuki Makino
 hitsthings
@@ -266,6 +269,7 @@ Lorenzo Stoakes
 Luciano Longo
 Luke Stagner
 lynschinzer
+Madhura Jayaratne
 Maksim Lin
 Maksym Taran
 Malay Majithia
@@ -290,6 +294,7 @@ Mateusz Paprocki
 Mathias Bynens
 mats cronqvist
 Matthew Beale
+Matthew Rathbone
 Matthias Bussonnier
 Matthias BUSSONNIER
 Matt McDonald
@@ -306,6 +311,7 @@ Micah Dubinko
 Michael Grey
 Michael Lehenbauer
 Michael Zhou
+Michal Dorner
 Mighty Guava
 Miguel Castillo
 mihailik
@@ -342,6 +348,7 @@ Nikolay Kostov
 nilp0inter
 Nisarg Jhaveri
 nlwillia
+noragrossman
 Norman Rzepka
 pablo
 Page
diff --git a/bower.json b/bower.json
index 13e7e5b47d..a9e0fd0d29 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"5.2.1",
+  "version":"5.3.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index ff3c7dd14d..9c8c3c0c70 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=5.3.0;f=">5.3</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.2.0;f=">5.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.1.0;f=">5.1</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.0.0;f=">5.0</option>
diff --git a/doc/manual.html b/doc/manual.html
index 2c44b92cf4..9cce7328d3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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 5.2.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.3.0</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 8d1e2cc008..0f9c69b319 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-05-2015: <a href="http://codemirror.net/codemirror-5.3.zip">Version 5.3</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix several regressions in the <a href="manual.html#addon_show-hint"><code>show-hint</code></a> addon (<code>completeSingle</code> option, <code>"shown"</code> and <code>"close"</code> events)</li>
+    <li>The <a href="../demo/vim.html">vim mode</a> was <a href="manual.html#vimapi">documented</a></li>
+    <li>New modes: <a href="../mode/asn.1/index.html">ASN.1</a>, <a href="../mode/ttcn/index.html">TTCN</a>, and <a href="../mode/ttcn-cfg/index.html">TTCN-CFG</a></li>
+    <li>The <a href="../mode/clike/index.html">clike</a> mode can now deep-indent <code>switch</code> statements, and rougly recognizes types and defined identifiers</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.2.0...5.3.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">20-04-2015: <a href="http://codemirror.net/codemirror-5.2.zip">Version 5.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index e2cca9f0bb..c8e38e3e19 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.2</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.3</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a> or<br>
       read the <a href="doc/releases.html">release notes</a>.<br>
       There is a <a href="doc/compress.html">minification helper</a>.
diff --git a/lib/codemirror.js b/lib/codemirror.js
index d611a96f1f..a1dfd0fc3d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8739,7 +8739,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.2.1";
+  CodeMirror.version = "5.3.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index b3e55d8778..94bd2c0fac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.2.1",
+    "version":"5.3.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",