diff --git a/AUTHORS b/AUTHORS
index 2ac890583277fedbda0f6498d296ac9abc33b2ee..67fd2fdcb04888b20a3b2f1bbb72392259e9331b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,7 @@ Andre von Houck
 Andrey Lushnikov
 Andy Kimball
 Andy Li
+angelozerr
 angelo.zerr@gmail.com
 Ankit Ahuja
 Ansel Santosa
@@ -30,6 +31,7 @@ Atul Bhouraskar
 Aurelian Oancea
 Bastian Müller
 benbro
+Benjamin DeCoste
 Ben Keen
 boomyjee
 borawjm
@@ -75,6 +77,7 @@ Felix Raab
 Filip Noetzel
 flack
 Ford_Lawnmower
+Gabriel Nahmias
 galambalazs
 Gautam Mehta
 Glenn Ruehle
@@ -91,6 +94,7 @@ Ian Wehrman
 Ian Wetherbee
 Ice White
 ICHIKAWA, Yuji
+Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
 Jacob Lee
@@ -206,6 +210,7 @@ santec
 Sascha Peilicke
 satchmorun
 sathyamoorthi
+SCLINIC\jdecker
 shaund
 shaun gilchrist
 Shmuel Englard
@@ -225,6 +230,7 @@ Tim Baumann
 Timothy Farrell
 Timothy Hatcher
 Tomas Varaneckas
+Tom Erik Støwer
 Tom MacWright
 Tony Jian
 Vestimir Markov
diff --git a/bower.json b/bower.json
index fae2426c8940189ad16c215fe8ca1d28a9c8f857..451d654c0c92cf5e5d2318327ff2548299d9f6fc 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "CodeMirror",
-  "version": "3.15.0",
+  "version": "3.16.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index f4d766b8c0ce8d35bd7e6fde43bbdfe8f88292c3..e100e60a0d4f6315466c9ab77bb9615f93a23bb2 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,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=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>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.13.0;f=">3.13</option>
diff --git a/doc/releases.html b/doc/releases.html
index 93650b8fe09773048ffbdf9a2758116d8d6e7032..d996d86066f768434f1b3d7245f55bf84636e656 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,6 +28,18 @@
 
   <h2>Version 3.x</h2>
 
+  <p class="rel">21-08-2013: <a href="http://codemirror.net/codemirror-3.16.zip">Version 3.16</a>:</p>
+
+  <ul class="rel-note">
+    <li>The whole codebase is now under a single <a href="../LICENSE">license</a> file.</li>
+    <li>The project page was overhauled and redesigned.</li>
+    <li>New themes: <a href="../demo/theme.html?paraiso-dark">Paraiso</a> (<a href="../demo/theme.html?paraiso-light">light</a>), <a href="../demo/theme.html?the-matrix">The Matrix</a>.</li>
+    <li>Improved interaction between themes and <a href="manual.html#addon_active-line">active-line</a>/<a href="manual.html#addon_matchbrackets">matchbrackets</a> addons.</li>
+    <li>New <a href="manual.html#addon_foldcode">folding</a> function <code>CodeMirror.fold.comment</code>.</li>
+    <li>Added <a href="manual.html#addon_fullscreen">fullscreen</a> addon.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.15.0...3.16.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">29-07-2013: <a href="http://codemirror.net/codemirror-3.15.zip">Version 3.15</a>:</p>
 
   <ul class="rel-note">
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 41dd4fe8a7c16ad2f30374277c6fb90f9ecad0e3..be262913b4443a869c60360c9c245a5c12421b7a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5821,7 +5821,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.15.1";
+  CodeMirror.version = "3.16.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 27c4f1729f3a5a8432441385dfa4487b8b32bc1b..3d436b0f78a326501ab72514e1f1f96621704f3d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.15.1",
+    "version":"3.16.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",