diff --git a/AUTHORS b/AUTHORS
index ed1cfe1cde06152d37e780c34df7b3eb1ab3d1d2..823dd8806366c1dfd3d980fccbd23e594a4a9371 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -151,6 +151,7 @@ Daniel Kesler
 Daniel KJ
 Daniel Neel
 Daniel Parnell
+Danila Malyutin
 Danny Yoo
 darealshinji
 Darius Roberts
@@ -352,6 +353,7 @@ ks-ifware
 kubelsmieci
 KwanEsq
 Kyle Kelley
+KyleMcNutt
 Lanfei
 Lanny
 Laszlo Vidacs
@@ -452,6 +454,7 @@ mps
 ms
 mtaran-google
 Mu-An Chiou
+mzabuawala
 Narciso Jaramillo
 Nathan Williams
 ndr
@@ -594,9 +597,11 @@ Taha Jahangir
 takamori
 Tako Schotanus
 Takuji Shimokawa
+Takuya Matsuyama
 Tarmil
 TDaglis
 tel
+Tentone
 tfjgeorge
 Thaddee Tyl
 thanasis
@@ -613,6 +618,7 @@ Timothy Gu
 Timothy Hatcher
 TobiasBg
 Todd Berman
+Todd Kennedy
 Tomas-A
 Tomas Varaneckas
 Tom Erik Støwer
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dd793cc57a11503bfcca293998e3571f49b13da..3df88c5b3a0caba66baf2a310165bc88286578c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+## 5.27.0 (2017-06-22)
+
+### Bug fixes
+
+Fix infinite loop in forced display update.
+
+Properly disable the hidden textarea when `readOnly` is `"nocursor"`.
+
+Calling the `Doc` constructor without `new` works again.
+
+[sql mode](http://codemirror.net/mode/sql/): Handle nested comments.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix bug where markup was ignored on indented paragraph lines.
+
+[vim bindings](http://codemirror.net/mode/demo/vim.html): Referencing invalid registers no longer causes an uncaught exception.
+
+[rust mode](http://codemirror.net/mode/rust/): Add the correct MIME type.
+
+[matchbrackets addon](http://codemirror.net/doc/manual.html#addon_matchbrackets): Document options.
+
+### New features
+
+Mouse button clicks can now be bound in keymaps by using names like `"LeftClick"` or `"Ctrl-Alt-MiddleTripleClick"`. When bound to a function, that function will be passed the position of the click as second argument.
+
+The behavior of mouse selection and dragging can now be customized with the [`configureMouse`](http://codemirror.net/doc/manual.html#option_configureMouse) option.
+
+Modes can now look ahead across line boundaries with the [`StringStream`](http://codemirror.net/doc/manual.html#StringStream)`.lookahead` method.
+
+Introduces a `"type"` token type, makes modes that recognize types output it, and add styling for it to the themes.
+
+New [`pasteLinesPerSelection`](http://codemirror.net/doc/manual.html#option_pasteLinesPerSelection) option to control the behavior of pasting multiple lines into multiple selections.
+
+[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Support multi-line regular expression matches, and normalize strings when matching.
+
 ## 5.26.0 (2017-05-22)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 2e0dd16df1e9c53c9b9591f7f255e4b187af770e..77f29b2356913ca0c24e2bac7f27076c45456cdc 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.26.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.27.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 a57a964a6b417de5bf989c4bb968cd3d5ade02c5..0ec8fc4b10556a2dfbe7c8b272f841702f3d400d 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,26 @@
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">22-06-2017: <a href="http://codemirror.net/codemirror-5.27.0.zip">Version 5.27.0</a>:</p>
+
+  <ul>
+    <li>Fix infinite loop in forced display update.</li>
+    <li>Properly disable the hidden textarea when <code>readOnly</code> is <code>&quot;nocursor&quot;</code>.</li>
+    <li>Calling the <code>Doc</code> constructor without <code>new</code> works again.</li>
+    <li><a href="http://codemirror.net/mode/sql/">sql mode</a>: Handle nested comments.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix bug where markup was ignored on indented paragraph lines.</li>
+    <li><a href="http://codemirror.net/mode/demo/vim.html">vim bindings</a>: Referencing invalid registers no longer causes an uncaught exception.</li>
+    <li><a href="http://codemirror.net/mode/rust/">rust mode</a>: Add the correct MIME type.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Document options.</li>
+    <li>Mouse button clicks can now be bound in keymaps by using names like <code>&quot;LeftClick&quot;</code> or <code>&quot;Ctrl-Alt-MiddleTripleClick&quot;</code>. When bound to a function, that function will be passed the position of the click as second argument.</li>
+    <li>The behavior of mouse selection and dragging can now be customized with the <a href="http://codemirror.net/doc/manual.html#option_configureMouse"><code>configureMouse</code></a> option.</li>
+    <li>Modes can now look ahead across line boundaries with the <a href="http://codemirror.net/doc/manual.html#StringStream"><code>StringStream</code></a><code>.lookahead</code> method.</li>
+    <li>Introduces a <code>&quot;type&quot;</code> token type, makes modes that recognize types output it, and add styling for it to the themes.</li>
+    <li>New <a href="http://codemirror.net/doc/manual.html#option_pasteLinesPerSelection"><code>pasteLinesPerSelection</code></a> option to control the behavior of pasting multiple lines into multiple selections.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Support multi-line regular expression matches, and normalize strings when matching.</li>
+  </ul>
+
   <p class="rel">22-05-2017: <a href="http://codemirror.net/codemirror-5.26.0.zip">Version 5.26.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 49a7aa08b132821b8444dc06195b00cd2dab3d38..815bc5d526b610ae6917271d302dc0529fc823d3 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.26.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.27.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 694b03c6df7994b1ce0ad3fa53efcc1dac9a4937..7ef5ffd3b9a338bb05afe4074cb99be3e64f5eaf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.26.1",
+  "version": "5.27.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 bcfb9de0716a1d5b889610e7ca6690093cc00523..3b7cd6dc45a89aa02fe12ecfabe97b514cbd60db 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.26.1"
+CodeMirror.version = "5.27.0"