diff --git a/AUTHORS b/AUTHORS
index 280dea2f5f48ec39b940d6638ac75128cee6797c..12643570437cac7fc6ff737da78575973151b7ce 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -68,6 +68,7 @@ Anthony Grimes
 Anton Kovalyov
 Apollo Zhu
 AQNOUCH Mohammed
+Aram Shatakhtsyan
 areos
 Arnab Bose
 Arsène von Wyss
@@ -155,6 +156,7 @@ Daniel Kesler
 Daniel KJ
 Daniel Neel
 Daniel Parnell
+Daniel Thwaites
 Danila Malyutin
 Danny Yoo
 darealshinji
@@ -213,7 +215,9 @@ ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
 Forrest Oliphant
+Franco Catena
 Frank Wiegand
+Fredrik Borg
 Gabriel Gheorghian
 Gabriel Horner
 Gabriel Nahmias
@@ -255,6 +259,7 @@ hitsthings
 Hocdoc
 Hugues Malphettes
 Ian Beck
+Ian Davies
 Ian Dickinson
 Ian Wehrman
 Ian Wetherbee
@@ -376,6 +381,7 @@ LloydMilligan
 LM
 lochel
 Lorenzo Stoakes
+Louis Mauchet
 Luca Fabbri
 Luciano Longo
 Lu Fangjian
@@ -660,6 +666,7 @@ Weiyan Shao
 wenli
 Wes Cossick
 Wesley Wiser
+Weston Ruter
 Will Binns-Smith
 Will Dean
 William Jamieson
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cc7ed75fdbe8c09c18b7f25169d1d72414b17d4..ff7d6e23119ea4736115124b021c9b4393010ddd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 5.30.0 (2017-09-20)
+
+### Bug fixes
+
+Fixed a number of issues with drawing right-to-left selections and mouse selection in bidirectional text.
+
+[search addon](http://codemirror.net/demo/search/): Fix crash when restarting search after doing empty search.
+
+[mark-selection addon](http://cm/doc/manual.html#addon_mark-selection): Fix off-by-one bug.
+
+[tern addon](http://codemirror.net/demo/tern.html): Fix bad request made when editing at the bottom of a large document.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve parsing in a number of corner cases.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.
+
+[gfm mode](http://codemirror.net/mode/gfm/): Don't highlight SHA1 'hashes' without numbers to avoid false positives.
+
+[soy mode](http://codemirror.net/mode/soy/): Support injected data and `@param` in comments.
+
+### New features
+
+[simple mode addon](http://codemirror.net/demo/simplemode.html): Allow groups in regexps when `token` isn't an array.
+
 ## 5.29.0 (2017-08-24)
 
 ### Bug fixes
@@ -54,7 +78,7 @@ Fix crash when using mode lookahead.
 
 ### Bug fixes
 
-Fix crash in the [simple mode](http://codemirror.net/demo/simplemode.html) addon.
+Fix crash in the [simple mode](http://codemirror.net/demo/simplemode.html)< addon.
 
 ## 5.27.0 (2017-06-22)
 
diff --git a/doc/manual.html b/doc/manual.html
index 354194e6cbdbcf62b65c301a2294796364433d01..67d5e4258a47d0e05502b64ca1d9e611f46d372f 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.29.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.30.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 586e2117f40e24ffbb54e18e03437c0639de15f4..e16ab6dd436ddd5a13cbe2ea2edbedc877d835f2 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,20 @@
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-09-2017: <a href="http://codemirror.net/codemirror-5.30.0.zip">Version 5.30.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fixed a number of issues with drawing right-to-left selections and mouse selection in bidirectional text.</li>
+    <li><a href="http://codemirror.net/demo/search/">search addon</a>: Fix crash when restarting search after doing empty search.</li>
+    <li><a href="http://cm/doc/manual.html#addon_mark-selection">mark-selection addon</a>: Fix off-by-one bug.</li>
+    <li><a href="http://codemirror.net/demo/tern.html">tern addon</a>: Fix bad request made when editing at the bottom of a large document.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve parsing in a number of corner cases.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.</li>
+    <li><a href="http://codemirror.net/mode/gfm/">gfm mode</a>: Don't highlight SHA1 'hashes' without numbers to avoid false positives.</li>
+    <li><a href="http://codemirror.net/mode/soy/">soy mode</a>: Support injected data and <code>@param</code> in comments.</li>
+    <li><a href="http://codemirror.net/demo/simplemode.html">simple mode addon</a>: Allow groups in regexps when <code>token</code> isn't an array.</li>
+  </ul>
+
   <p class="rel">24-08-2017: <a href="http://codemirror.net/codemirror-5.29.0.zip">Version 5.29.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 68b9e507a492a2772d5773660f8077d37c3743e4..d161e77c6f5c95ca3e2a53215ad79031e0f0ed98 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.29.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.30.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 d5f2329ef95a4dbe92e3229f38b22f5cab487de2..f251b238fd464f9c2b213247193ff89af38e6623 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.29.1",
+  "version": "5.30.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 c75e3bbc612cf2464992c33698adbfa37061d054..4298c61ff1c5cf3d6b27d80f57abfcf8e539b3c6 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.29.1"
+CodeMirror.version = "5.30.0"