diff --git a/AUTHORS b/AUTHORS
index 1e3ece23e0e7cd6f77de40f539cfaefe66251d1f..4f0606412956d7c4139c65e633aca8c94440e9af 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -91,6 +91,7 @@ Brian Sletten
 Bruce Mitchener
 Caitlin Potter
 Calin Barbat
+Chad Jolly
 Chandra Sekhar Pydi
 Charles Skelton
 Cheah Chu Yeow
@@ -233,6 +234,7 @@ jeffkenton
 Jeff Pickhardt
 jem (graphite)
 Jeremy Parmenter
+JobJob
 Jochen Berger
 Johan Ask
 John Connor
@@ -247,6 +249,7 @@ Jon Malmaud
 Jon Sangster
 Joost-Wim Boekesteijn
 Joseph Pecoraro
+Josh Cohen
 Joshua Newman
 Josh Watzman
 jots
@@ -259,6 +262,7 @@ Justin Hileman
 jwallers@gmail.com
 kaniga
 karevn
+Kayur Patel
 Ken Newman
 Ken Rockot
 Kevin Earls
@@ -437,6 +441,7 @@ SCLINIC\jdecker
 Scott Aikin
 Scott Goodhew
 Sebastian Zaha
+Sergey Goder
 Se-Won Kim
 shaund
 shaun gilchrist
@@ -459,12 +464,14 @@ Steffen Beyer
 Stephen Lavelle
 Steve O'Hara
 stoskov
+Stu Kennedy
 Sungho Kim
 sverweij
 Taha Jahangir
 Tako Schotanus
 Takuji Shimokawa
 Tarmil
+TDaglis
 tel
 tfjgeorge
 Thaddee Tyl
diff --git a/doc/compress.html b/doc/compress.html
index 6a183ca52852a98949db8e11cf60c553a23e5e29..7712274c83ee9d665f47ca5a626e0f4c19d3cc75 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@
       <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.9.0;f=">5.9</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.8.0;f=">5.8</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.7.0;f=">5.7</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.6.0;f=">5.6</option>
diff --git a/doc/manual.html b/doc/manual.html
index 8916b57f3f5875c8531d41f3e960ce86c67edf37..7e1ce1aaa5d7da740b8ed3ce19d2acddb1f405d8 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.8.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.9.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 3d841ef6e8183b19da6bdd2f54ea9af1475d9d35..ca3e2e6284caff4f18b3a51b8378d5376af44ea8 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,17 @@
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">23-10-2015: <a href="http://codemirror.net/codemirror-5.9.zip">Version 5.9</a>:</p>
+
+  <ul class="rel-note">
+    <li>Improve the way overlay (OS X-style) scrollbars are handled</li>
+    <li>Make <a href="manual.html#addon_annotatescrollbar">annotatescrollbar</a> and scrollpastend addons work properly together</li>
+    <li>Make <a href="manual.html#addon_show-hint">show-hint</a> addon select options on single click by default, move selection to hovered item</li>
+    <li>Properly fold comments that include block-comment-start markers</li>
+    <li>Many small language mode fixes</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.8.0...5.9.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">20-10-2015: <a href="http://codemirror.net/codemirror-5.8.zip">Version 5.8</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index b29e0b51de49f7ce6be57f7459d6445675448616..a393997dfd18579229cb41f24248eab67091a6da 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.8</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.9</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 249f40ee5ee9f43f6a5f690232aa511ab0cca3a4..2c4c3fb87f38f080963a1ba1ae3e48b81d07fcb4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8866,7 +8866,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.8.1";
+  CodeMirror.version = "5.9.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 934af6a0fdff9fa3f63915913e0acd5062ae487f..9b1cc8e3b568c2f0155200ddf3ee2c047242c150 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.8.1",
+    "version":"5.9.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",