diff --git a/AUTHORS b/AUTHORS
index 03b4141ea5..f57c98a145 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -104,7 +104,9 @@ binny
 B Krishna Chaitanya
 Blaine G
 blukat29
+Bo
 boomyjee
+Bo Peng
 borawjm
 Brad Metcalf
 Brandon Frohs
@@ -202,6 +204,7 @@ Elisée
 Emmanuel Schanzer
 Enam Mijbah Noor
 Eric Allam
+Eric Bogard
 Erik Welander
 eustas
 Fabien Dubosson
@@ -266,6 +269,7 @@ Hélio
 Hendrik Wallbaum
 Henrik Haugbølle
 Herculano Campos
+hidaiy
 Hiroyuki Makino
 hitsthings
 Hocdoc
@@ -364,6 +368,7 @@ Justin Hileman
 jwallers@gmail.com
 kaniga
 karevn
+Karol
 Kayur Patel
 Kazuhito Hokamura
 Ken Newman
@@ -495,6 +500,7 @@ mps
 ms
 mtaran-google
 Mu-An Chiou
+Mu-An ✌️ Chiou
 mzabuawala
 Narciso Jaramillo
 Nathan Williams
@@ -695,8 +701,10 @@ Travis Heppe
 Triangle717
 Tristan Tarrant
 TSUYUSATO Kitsune
+Tugrul Elmas
 twifkak
 Tyler Long
+Vadzim Ramanenka
 Vaibhav Sagar
 VapidWorx
 Vestimir Markov
@@ -716,6 +724,7 @@ William Jamieson
 William Stein
 Willy
 Wojtek Ptak
+wonderboyjon
 Wu Cheng-Han
 Xavier Mendez
 Yassin N. Hassan
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8199fd30b..8972e9aecf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 5.37.0 (2018-04-20)
+
+### Bug fixes
+
+Suppress keypress events during composition, for platforms that don't properly do this themselves.
+
+[xml-fold addon](http://codemirror.net/demo/folding.html): Improve handling of line-wrapped opening tags.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve TypeScript support.
+
+[python mode](http://codemirror.net/mode/python/): Highlight expressions inside format strings.
+
+### New features
+
+[vim bindings](http://codemirror.net/demo/vim.html): Add support for '(' and ')' movement.
+
+New themes: [idea](http://codemirror.net/demo/theme.html#idea), [ssms](http://codemirror.net/demo/theme.html#ssms), [gruvbox-dark](http://codemirror.net/demo/theme.html#gruvbox-dark).
+
 ## 5.36.0 (2018-03-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 4c95e325a1..e069dcfe6b 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.36.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.37.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 1cdea6729a..7919aa3e55 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,9 +30,20 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-04-2018: <a href="http://codemirror.net/codemirror-5.37.0.zip">Version 5.37.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Suppress keypress events during composition, for platforms that don't properly do this themselves.</li>
+    <li><a href="http://codemirror.net/demo/folding.html">xml-fold addon</a>: Improve handling of line-wrapped opening tags.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve TypeScript support.</li>
+    <li><a href="http://codemirror.net/mode/python/">python mode</a>: Highlight expressions inside format strings.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Add support for '(' and ')' movement.</li>
+    <li>New themes: <a href="http://codemirror.net/demo/theme.html#idea">idea</a>, <a href="http://codemirror.net/demo/theme.html#ssms">ssms</a>, <a href="http://codemirror.net/demo/theme.html#gruvbox-dark">gruvbox-dark</a>.</li>
+  </ul>
+
   <p class="rel">20-03-2018: <a href="http://codemirror.net/codemirror-5.36.0.zip">Version 5.36.0</a>:</p>
 
-  <ul>
+  <ul class="rel-note">
     <li>Make sure all document-level event handlers are registered on the document that the editor is part of.</li>
     <li>Fix issue that prevented edits whose origin starts with <code>+</code> from being combined in history events for an editor-less document.</li>
     <li><a href="http://codemirror.net/demo/multiplex.html">multiplex addon</a>: Improve handling of indentation.</li>
@@ -46,7 +57,7 @@ <h2>Version 5.x</h2>
 
   <p class="rel">20-02-2018: <a href="http://codemirror.net/codemirror-5.35.0.zip">Version 5.35.0</a>:</p>
 
-  <ul>
+  <ul class="rel-note">
     <li>Fix problem where selection undo might change read-only documents.</li>
     <li>Fix crash when calling <code>addLineWidget</code> on a document that has no attached editor.</li>
     <li><a href="http://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix behavior of <code>^</code> in multiline regexp mode.</li>
@@ -62,7 +73,7 @@ <h2>Version 5.x</h2>
 
   <p class="rel">29-01-2018: <a href="http://codemirror.net/codemirror-5.34.0.zip">Version 5.34.0</a>:</p>
 
-  <ul>
+  <ul class="rel-note">
     <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix a problem where inline styles would persist across list items.</li>
     <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix the <code>toggleBookmark</code> command.</li>
     <li><a href="http://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when closing triple quotes.</li>
diff --git a/index.html b/index.html
index c0e3e9a235..02ff74f82d 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.36.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.37.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index e6d4a897ed..47db21257d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.36.1",
+  "version": "5.37.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 486354a5c3..0a704cddd5 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.36.1"
+CodeMirror.version = "5.37.0"