diff --git a/AUTHORS b/AUTHORS
index 09fe9a893c7964ecc221ff2c3f7bc78da1fca5d3..741ba1e35e7a0f9490728e86174481936ae9c71d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -124,6 +124,7 @@ Daniel, Dao Quang Minh
 Daniele Di Sarli
 Daniel Faust
 Daniel Huigens
+Daniel Kesler
 Daniel KJ
 Daniel Neel
 Daniel Parnell
@@ -186,6 +187,7 @@ gekkoe
 Gerard Braad
 Gergely Hegykozi
 Giovanni Calò
+Glebov Boris
 Glenn Jorde
 Glenn Ruehle
 Golevka
@@ -255,6 +257,7 @@ John Engler
 John Lees-Miller
 John Snelson
 John Van Der Loo
+Jon Ander Peñalba
 Jonas Döbertin
 Jonathan Malmaud
 jongalloway
@@ -414,6 +417,7 @@ Patrick Stoica
 Patrick Strawderman
 Paul Garvin
 Paul Ivanov
+Pavel
 Pavel Feldman
 Pavel Strashkin
 Paweł Bartkiewicz
@@ -481,7 +485,9 @@ Stanislav Oaserele
 Stas Kobzar
 Stefan Borsje
 Steffen Beyer
+Steffen Bruchmann
 Stephen Lavelle
+Steve Champagne
 Steve O'Hara
 stoskov
 Stu Kennedy
@@ -534,6 +540,7 @@ Yassin N. Hassan
 YNH Webdev
 Yunchi Luo
 Yuvi Panda
+Zac Anger
 Zachary Dremann
 Zhang Hao
 zziuni
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b702c3583b4a6b51f4d1a46e40bf428e87c64532..7eb70e9c53a0fc4264647f6a6f83c196ec7f7fce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,45 @@
+## 5.12.0 (2015-02-19)
+
+### New features
+
+[Vim bindings](http://codemirror.net/demo/vim.html): Ctrl-Q is now an alias for Ctrl-V.
+
+[Vim bindings](http://codemirror.net/demo/vim.html): The Vim API now exposes an `unmap` method to unmap bindings.
+
+[active-line addon](http://codemirror.net/demo/activeline.html): This addon can now style the active line's gutter.
+
+[FCL mode](http://codemirror.net/mode/fcl/): Newly added.
+
+[SQL mode](http://codemirror.net/mode/sql/): Now has a Postgresql dialect.
+
+### Bugfixes
+
+Fix [issue](https://github.com/codemirror/CodeMirror/issues/3781) where trying to scroll to a horizontal position outside of the document's width could cause the gutter to be positioned incorrectly.
+
+Use absolute, rather than fixed positioning in the context-menu intercept hack, to work around a [problem](https://github.com/codemirror/CodeMirror/issues/3238) when the editor is inside a transformed parent container.
+
+Solve a [problem](https://github.com/codemirror/CodeMirror/issues/3821) where the horizontal scrollbar could hide text in Firefox.
+
+Fix a [bug](https://github.com/codemirror/CodeMirror/issues/3834) that caused phantom scroll space under the text in some situations.
+
+[Sublime Text bindings](http://codemirror.net/demo/sublime.html): Bind delete-line to Shift-Ctrl-K on OS X.
+
+[Markdown mode](http://codemirror.net/mode/markdown/): Fix [issue](https://github.com/codemirror/CodeMirror/issues/3787) where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.
+
+[Markdown mode](http://codemirror.net/mode/markdown/): Ignore backslashes in code fragments.
+
+[Markdown mode](http://codemirror.net/mode/markdown/): Use whichever mode is registered as `text/html` to parse HTML.
+
+[Clike mode](http://codemirror.net/mode/clike/): Improve indentation of Scala `=>` functions.
+
+[Python mode](http://codemirror.net/mode/python/): Improve indentation of bracketed code.
+
+[HTMLMixed mode](http://codemirror.net/mode/htmlmixed/): Support multi-line opening tags for sub-languages (`<script>`, `<style>`, etc).
+
+[Spreadsheet mode](http://codemirror.net/mode/spreadsheet/): Fix bug where the mode did not advance the stream when finding a backslash.
+
+[XML mode](http://codemirror.net/mode/xml/): The mode now takes a `matchClosing` option to configure whether mismatched closing tags should be highlighted as errors.
+
 ## 5.11.0 (2016-01-20)
 
 * New modes: [JSX](http://codemirror.net/mode/jsx/index.html), [literate Haskell](http://codemirror.net/mode/haskell-literate/index.html)
diff --git a/doc/compress.html b/doc/compress.html
index 517d57511ab3720aad451f0bf01a0c9939494d7d..8f0d3e9f42d4c98ae680d7bf0a37373387fe46b3 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.12.0;f=">5.12</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.11.0;f=">5.11</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.10.0;f=">5.10</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.9.0;f=">5.9</option>
diff --git a/doc/manual.html b/doc/manual.html
index c48a35f90e41214e5a3788efa04c7b738661e1cd..8081d8ca40ee0662d0e0c90e79714f2f08e6da37 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.11.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.12.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 43ee827413e86d9b771512e64da7928484be4dea..a8e15ac059fc97108341d4608c870f04847951c4 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,29 @@
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">19-02-2016: <a href="http://codemirror.net/codemirror-5.12.zip">Version 5.12</a>:</p>
+
+  <ul>
+    <li><a href="http://codemirror.net/demo/vim.html">Vim bindings</a>: Ctrl-Q is now an alias for Ctrl-V.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">Vim bindings</a>: The Vim API now exposes an <code>unmap</code> method to unmap bindings.</li>
+    <li><a href="http://codemirror.net/demo/activeline.html">active-line addon</a>: This addon can now style the active line's gutter.</li>
+    <li><a href="http://codemirror.net/mode/fcl/">FCL mode</a>: Newly added.</li>
+    <li><a href="http://codemirror.net/mode/sql/">SQL mode</a>: Now has a Postgresql dialect.</li>
+    <li>Fix <a href="https://github.com/codemirror/CodeMirror/issues/3781">issue</a> where trying to scroll to a horizontal position outside of the document's width could cause the gutter to be positioned incorrectly.</li>
+    <li>Use absolute, rather than fixed positioning in the context-menu intercept hack, to work around a <a href="https://github.com/codemirror/CodeMirror/issues/3238">problem</a> when the editor is inside a transformed parent container.</li>
+    <li>Solve a <a href="https://github.com/codemirror/CodeMirror/issues/3821">problem</a> where the horizontal scrollbar could hide text in Firefox.</li>
+    <li>Fix a <a href="https://github.com/codemirror/CodeMirror/issues/3834">bug</a> that caused phantom scroll space under the text in some situations.</li>
+    <li><a href="http://codemirror.net/demo/sublime.html">Sublime Text bindings</a>: Bind delete-line to Shift-Ctrl-K on OS X.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">Markdown mode</a>: Fix <a href="https://github.com/codemirror/CodeMirror/issues/3787">issue</a> where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">Markdown mode</a>: Ignore backslashes in code fragments.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">Markdown mode</a>: Use whichever mode is registered as <code>text/html</code> to parse HTML.</li>
+    <li><a href="http://codemirror.net/mode/clike/">Clike mode</a>: Improve indentation of Scala <code>=&gt;</code> functions.</li>
+    <li><a href="http://codemirror.net/mode/python/">Python mode</a>: Improve indentation of bracketed code.</li>
+    <li><a href="http://codemirror.net/mode/htmlmixed/">HTMLMixed mode</a>: Support multi-line opening tags for sub-languages (<code>&lt;script&gt;</code>, <code>&lt;style&gt;</code>, etc).</li>
+    <li><a href="http://codemirror.net/mode/spreadsheet/">Spreadsheet mode</a>: Fix bug where the mode did not advance the stream when finding a backslash.</li>
+    <li><a href="http://codemirror.net/mode/xml/">XML mode</a>: The mode now takes a <code>matchClosing</code> option to configure whether mismatched closing tags should be highlighted as errors.</li>
+  </ul>
+
   <p class="rel">20-01-2016: <a href="http://codemirror.net/codemirror-5.11.zip">Version 5.11</a>:</p>
 
   <ul>
diff --git a/index.html b/index.html
index 2bb1f41d1fc567f6d3b45f0bead47d135c74e20f..1762598d8d8de0181230bffb246398c9a2fc666d 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.11</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.12</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 14c8b7389d2cd497abf7088f9248714154c798b6..e803211bc21cffb48fef06d178fe93c0d2cc5f4d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8886,7 +8886,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.11.1";
+  CodeMirror.version = "5.12.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index f24c06fc243a62533ac56c27571b43c89e39f820..0ff734e8ce7ad3eec1f34ed2b44b9e885e910d59 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.11.1",
+    "version":"5.12.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",