diff --git a/AUTHORS b/AUTHORS
index ce2be8d6d286eec15e49833b834ba1951f3b0d62..6a96b87c0ac78919fd3a5d310e2668fa16d4732d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -218,6 +218,7 @@ Hardest
 Harshvardhan Gupta
 Hasan Karahan
 Hector Oswaldo Caballero
+Hendrik Wallbaum
 Herculano Campos
 Hiroyuki Makino
 hitsthings
@@ -332,6 +333,7 @@ lochel
 Lorenzo Stoakes
 Luciano Longo
 Lu Fangjian
+Luke Granger-Brown
 Luke Stagner
 lynschinzer
 M1cha
@@ -444,6 +446,7 @@ Patrick Stoica
 Patrick Strawderman
 Paul Garvin
 Paul Ivanov
+Paul Masson
 Pavel
 Pavel Feldman
 Pavel Petržela
@@ -507,6 +510,7 @@ sheopory
 Shiv Deepak
 Shmuel Englard
 Shubham Jain
+Siamak Mokhtari
 silverwind
 sinkuu
 snasa
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a34cf82ffae78f470ecc78a82decb8cd8d49c572..55ace8ffa37d56bcf5e26bd2bfbdb51259ac95ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 5.17.0 (2016-07-19)
+
+### Bugfixes
+
+Fix problem with wrapped trailing whitespace displaying incorrectly.
+
+Prevent IME dialog from overlapping typed content in Chrome.
+
+Improve measuring of characters near a line wrap.
+
+[javascript mode](http://codemirror.net/mode/javascript): Improve support for `async`, allow trailing commas in `import` lists.
+
+[vim bindings](http://codemirror.net/demo/vim.html): Fix backspace in replace mode.
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Fix some key bindings on OS X to match Sublime Text.
+
+### New features
+
+[markdown mode](http://codemirror.net/mode/markdown): Add more classes to image links in highlight-formatting mode.
+
 ## 5.16.0 (2016-06-20)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index b890bee02161d5677a4a4bf6ddf6f54cee82da19..7f08f71c240d34e6dda0f8676168f2a8371bc7ab 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.17.0;f=">5.17.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.16.0;f=">5.16.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.2;f=">5.15.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.0;f=">5.15.0</option>
diff --git a/doc/manual.html b/doc/manual.html
index 030287c3efda3f8669c5d533dd45c714ed4f21f2..f61c1e1d7a015605a6b369c6e5570a6594d46bd3 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.16.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.17.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 052f7809c09249ccf5b9ce7f84a79e27488cefec..17ec88a96d97414e447db047cbbe750aa9c6f869 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,18 @@
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">19-07-2016: <a href="http://codemirror.net/codemirror-5.17.0.zip">Version 5.17.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix problem with wrapped trailing whitespace displaying incorrectly.</li>
+    <li>Prevent IME dialog from overlapping typed content in Chrome.</li>
+    <li>Improve measuring of characters near a line wrap.</li>
+    <li><a href="http://codemirror.net/mode/javascript">javascript mode</a>: Improve support for <code>async</code>, allow trailing commas in <code>import</code> lists.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Fix backspace in replace mode.</li>
+    <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix some key bindings on OS X to match Sublime Text.</li>
+    <li><a href="http://codemirror.net/mode/markdown">markdown mode</a>: Add more classes to image links in highlight-formatting mode.</li>
+  </ul>
+
   <p class="rel">20-06-2016: <a href="http://codemirror.net/codemirror-5.16.0.zip">Version 5.16.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 528b3a430a73e1c09c2ba53e16faa9a4ed28e854..8860f8b4e346a4901da7e2c85a755bb1ef37cfb7 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.16.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.17.0</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 c78a6f22da5b5209b5e35a21379c4e2c26f542d6..5009f836cbffedef68681071b165f311d558f43c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8929,7 +8929,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.16.2";
+  CodeMirror.version = "5.17.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 276c2d29e986849d856855f0e5bdc09bd903a047..fa09ced88851a38f971b90573900e27385dfde65 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.16.2",
+    "version":"5.17.0",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",