diff --git a/AUTHORS b/AUTHORS
index bb6f8c8c64..ad2ec99576 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,7 @@ alexey-k
 Alex Piggott
 Amy
 Ananya Sen
+AndersMad
 Andre von Houck
 Andrey Lushnikov
 Andy Kimball
@@ -36,6 +37,7 @@ Ben Keen
 boomyjee
 borawjm
 Brandon Frohs
+Brett Zamir
 Brian Sletten
 Bruce Mitchener
 Chandra Sekhar Pydi
@@ -44,6 +46,7 @@ Chris Coyier
 Chris Granger
 Chris Morgan
 Christopher Brown
+ciaranj
 CodeAnimal
 ComFreek
 dagsta
@@ -76,6 +79,7 @@ Felipe Lalanne
 Felix Raab
 Filip Noetzel
 flack
+ForbesLindesay
 Ford_Lawnmower
 Gabriel Nahmias
 galambalazs
@@ -85,6 +89,7 @@ Golevka
 Gordon Smith
 greengiant
 Guillaume Massé
+Guillaume Massé
 Hans Engel
 Hardest
 Hasan Karahan
@@ -137,6 +142,7 @@ komakino
 Konstantin Lopuhin
 koops
 ks-ifware
+kubelsmieci
 Lanny
 leaf corcoran
 Leonya Khachaturov
@@ -151,6 +157,8 @@ Marco Aurélio
 Marijn Haverbeke
 Mario Pietsch
 Mark Lentczner
+Martin Balek
+Martín Gaitán
 Mason Malone
 Mateusz Paprocki
 mats cronqvist
@@ -219,6 +227,7 @@ Stas Kobzar
 Stefan Borsje
 Steffen Beyer
 Steve O'Hara
+stoskov
 Tarmil
 tfjgeorge
 Thaddee Tyl
@@ -228,6 +237,8 @@ Thomas Schmid
 Tim Baumann
 Timothy Farrell
 Timothy Hatcher
+TobiasBg
+Tomas-A
 Tomas Varaneckas
 Tom Erik Støwer
 Tom MacWright
diff --git a/bower.json b/bower.json
index 451d654c0c..2aeffb8990 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "CodeMirror",
-  "version": "3.16.0",
+  "version": "3.17.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index d7f720fae1..30b148dd63 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,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=3.17.0;f=">3.17</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.16.0;f=">3.16</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.15.0;f=">3.15</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.14.0;f=">3.14</option>
diff --git a/doc/releases.html b/doc/releases.html
index d996d86066..88996e27a0 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,6 +28,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 3.x</h2>
 
+  <p class="rel">23-09-2013: <a href="http://codemirror.net/codemirror-3.17.zip">Version 3.17</a>:</p>
+
+  <ul class="rel-note">
+    <li>New modes: <a href="../mode/fortran/index.html">Fortran</a>, <a href="../mode/octave/index.html">Octave</a> (Matlab), <a href="../mode/toml/index.html">TOML</a>, and <a href="../mode/dtd/index.html">DTD</a>.</li>
+    <li>New addons: <a href="../addon/lint/css-lint.js"><code>css-lint</code></a>, <a href="manual.html#addon_css-hint"><code>css-hint</code></a>.</li>
+    <li>Improve resilience to CSS 'frameworks' that globally mess up <code>box-sizing</code>.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.16.0...3.17.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">21-08-2013: <a href="http://codemirror.net/codemirror-3.16.zip">Version 3.16</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 3cb82b48c4..26a0f07e62 100644
--- a/index.html
+++ b/index.html
@@ -84,7 +84,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 3.16</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 3.17</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 41b4d759ed..1d7003570b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5879,7 +5879,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.16.1";
+  CodeMirror.version = "3.17.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index e50ba6a808..f5c28e0c41 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.16.1",
+    "version":"3.17.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",