diff --git a/AUTHORS b/AUTHORS
index a4f2b94b79..b9bf72103c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,6 +25,7 @@ Alexandre Bique
 alexey-k
 Alex Piggott
 Aliaksei Chapyzhenka
+Amin Shali
 Amsul
 amuntean
 Amy
@@ -81,10 +82,13 @@ Cheah Chu Yeow
 Chris Coyier
 Chris Granger
 Chris Houseknecht
+Chris Lohfink
 Chris Morgan
 Christian Oyarzun
 Christian Petrov
 Christopher Brown
+Christopher Mitchell
+Christopher Pfohl
 ciaranj
 CodeAnimal
 coderaiser
@@ -106,6 +110,7 @@ Danny Yoo
 darealshinji
 Darius Roberts
 Dave Myers
+David Barnett
 David Mignot
 David Pathakjee
 David Vázquez
@@ -182,6 +187,7 @@ ilvalle
 Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
+Ivoah
 Jacob Lee
 Jakob Miland
 Jakub Vrana
@@ -213,6 +219,7 @@ John Connor
 John Lees-Miller
 John Snelson
 John Van Der Loo
+Jonas Döbertin
 Jonathan Malmaud
 jongalloway
 Jon Malmaud
@@ -223,6 +230,7 @@ Joshua Newman
 Josh Watzman
 jots
 jsoojeon
+ju1ius
 Juan Benavides Romero
 Jucovschi Constantin
 Juho Vuori
@@ -250,6 +258,8 @@ Leonid Khachaturov
 Leon Sorokin
 Leonya Khachaturov
 Liam Newman
+Libo Cannici
+LloydMilligan
 LM
 lochel
 Lorenzo Stoakes
@@ -274,6 +284,7 @@ Marko Bonaci
 Martin Balek
 Martín Gaitán
 Martin Hasoň
+Martin Hunt
 Mason Malone
 Mateusz Paprocki
 Mathias Bynens
@@ -292,6 +303,7 @@ Max Xiantu
 mbarkhau
 Metatheos
 Micah Dubinko
+Michael Grey
 Michael Lehenbauer
 Michael Zhou
 Mighty Guava
@@ -308,6 +320,7 @@ misfo
 mloginov
 Moritz Schwörer
 mps
+ms
 mtaran-google
 Narciso Jaramillo
 Nathan Williams
@@ -319,6 +332,7 @@ nguillaumin
 Ng Zhi An
 Nicholas Bollweg
 Nicholas Bollweg (Nick)
+Nick Kreeger
 Nick Small
 Niels van Groningen
 nightwing
@@ -333,6 +347,7 @@ pablo
 Page
 Panupong Pasupat
 paris
+Paris
 Patil Arpith
 Patrick Stoica
 Patrick Strawderman
diff --git a/bower.json b/bower.json
index 59f7380eab..84808c8bc3 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"5.1.1",
+  "version":"5.2.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index f34e28b97e..581bacf07f 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.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>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.13.0;f=">4.13</option>
diff --git a/doc/manual.html b/doc/manual.html
index 1b70128ab6..185be703df 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 5.1.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.2.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 1ca06d016d..ec2a6bf68c 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,23 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-04-2015: <a href="http://codemirror.net/codemirror-5.2.zip">Version 5.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix several race conditions
+    in <a href="manual.html#addon_show-hint"><code>show-hint</code></a>'s
+    asynchronous mode</li>
+    <li>Fix backspace binding in <a href="../demo/sublime.html">Sublime bindings</a></li>
+    <li>Change the way IME is handled in the <code>"textarea"</code> <a href="manual.html#option_inputStyle">input style</a></li>
+    
+    <li>New modes: <a href="../mode/mumps/index.html">MUMPS</a>, <a href="../mode/handlebars/index.html">Handlebars</a></li>
+    <li>Rewritten modes: <a href="../mode/django/index.html">Django</a>, <a href="../mode/z80/index.html">Z80</a></li>
+    <li>Theme: <a href="../demo/theme.html?liquibyte">Liquibyte</a></li>
+    <li>New option: <a href="manual.html#option_lineWiseCopyCut"><code>lineWiseCopyCut</code></a></li>
+    <li>The <a href="../demo/vim.html">Vim mode</a> now supports buffer-local options and the <code>filetype</code> setting</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.1.0...5.2.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">23-03-2015: <a href="http://codemirror.net/codemirror-5.1.zip">Version 5.1</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index a8680cd904..e2cca9f0bb 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.1</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.2</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 cc6d774241..37e268554c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8732,7 +8732,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.1.1";
+  CodeMirror.version = "5.2.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 5c953fdd72..1d198cd801 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.1.1",
+    "version":"5.2.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",