diff --git a/AUTHORS b/AUTHORS
index 737acedabaca0f4b793cce97001379ea6a7de4f0..9af00e54e4b6ae870efbcc6b0d3922bdecfeab63 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,8 +18,10 @@ Alexander Schepanovski
 Alexander Solovyov
 alexey-k
 Alex Piggott
+Amsul
 Amy
 Ananya Sen
+anaran
 AndersMad
 Anderson Mesquita
 Andre von Houck
@@ -42,6 +44,9 @@ benbro
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Ben Keen
+Bernhard Sirlinger
+Billy Moon
+Blaine G
 boomyjee
 borawjm
 Brandon Frohs
@@ -53,11 +58,13 @@ Chandra Sekhar Pydi
 Charles Skelton
 Chris Coyier
 Chris Granger
+Chris Houseknecht
 Chris Morgan
 Christopher Brown
 ciaranj
 CodeAnimal
 ComFreek
+Curtis Gagliardi
 dagsta
 Dan Heberden
 Daniel, Dao Quang Minh
@@ -72,6 +79,7 @@ David Mignot
 David Pathakjee
 deebugger
 Deep Thought
+domagoj412
 Dominator008
 Domizio Demichelis
 Drew Bratcher
@@ -85,6 +93,7 @@ ekhaled
 Enam Mijbah Noor
 Eric Allam
 eustas
+Fabien O'Carroll
 Fabio Zendhi Nagao
 Fauntleroy
 fbuchinger
@@ -96,6 +105,7 @@ flack
 ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
+Frank Wiegand
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
@@ -103,6 +113,7 @@ Glenn Jorde
 Glenn Ruehle
 Golevka
 Gordon Smith
+Grant Skinner
 greengiant
 Guillaume Massé
 Guillaume Massé
@@ -122,6 +133,7 @@ Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
 Jacob Lee
+Jakob Miland
 Jakub Vrana
 James Campos
 James Thorne
@@ -146,6 +158,7 @@ John Connor
 John Lees-Miller
 John Snelson
 John Van Der Loo
+Jonathan Malmaud
 jongalloway
 Jon Malmaud
 Joost-Wim Boekesteijn
@@ -179,8 +192,10 @@ Luciano Longo
 lynschinzer
 Maksim Lin
 Maksym Taran
+Manuel Rego Casasnovas
 Marat Dreizin
 Marco Aurélio
+Marco Munizaga
 Marijn Haverbeke
 Mario Pietsch
 Mark Lentczner
@@ -216,10 +231,14 @@ Miraculix87
 misfo
 mloginov
 mps
+mtaran-google
 Narciso Jaramillo
 Nathan Williams
+ndr
 nerbert
+nextrevision
 nguillaumin
+Nicholas Bollweg
 Niels van Groningen
 Nikita Beloglazov
 Nikita Vasilyev
@@ -240,10 +259,12 @@ prasanthj
 Prasanth J
 Rahul
 Randy Edmunds
+Rasmus Erik Voel Jensen
 Richard Z.H. Wang
 robertop23
 Robert Plummer
 Ruslan Osmanov
+Ryan Prior
 sabaca
 Samuel Ainsworth
 sandeepshetty
@@ -256,6 +277,7 @@ Sebastian Zaha
 shaund
 shaun gilchrist
 Shawn A
+sheopory
 Shiv Deepak
 Shmuel Englard
 soliton4
@@ -284,6 +306,7 @@ Tom Erik Støwer
 Tom MacWright
 Tony Jian
 Travis Heppe
+Triangle717
 Vestimir Markov
 vf
 Volker Mische
diff --git a/doc/compress.html b/doc/compress.html
index d318ab80ee9501a39371fb1566be705ea8fe0c3a..018018747cac2e520e0cd9da73f44fdef72898ed 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.22.0;f=">3.22</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.21.0;f=">3.21</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.20.0;f=">3.20</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.19.0;f=">3.19</option>
diff --git a/doc/releases.html b/doc/releases.html
index 47b3dfb61f38b277890e0cdca1241f5b73dcd149..840439daca7bc492f854f815455b6ff8fd3e529e 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,6 +28,16 @@
 
   <h2>Version 3.x</h2>
 
+  <p class="rel">21-02-2014: <a href="http://codemirror.net/codemirror-3.22.zip">Version 3.22</a>:</p>
+
+  <ul class="rel-note">
+    <li>Adds the <a href="doc/manual.html#findMarks"><code>findMarks</code></a> method.</li>
+    <li>New addons: <a href="doc/manual.html#addon_rulers">rulers</a>, markdown-fold, yaml-lint.</li>
+    <li>New theme: <a href="demo/theme.html?mdn-like">mdn-like</a>.</li>
+    <li>New mode: <a href="mode/sold/index.html">Sold</a>.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.21.0...3.22.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">16-01-2014: <a href="http://codemirror.net/codemirror-3.21.zip">Version 3.21</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 49c28339a430269b9712ad15344f5d2460d2da36..53c1bde7056f00706bad2abb942927f90f10e797 100644
--- a/index.html
+++ b/index.html
@@ -84,7 +84,7 @@
   </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.21</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 3.22</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 3e5a65d8b347cefdae47ac0fa202b123b3afe493..2eecf811d37063ce2df1c2541baa9aa07ed2fe10 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6085,7 +6085,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.21.1";
+  CodeMirror.version = "3.22.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index e8a7c18ac40af0bb0b7d0965e94cd8041b290c90..ca23ff7ed2b1ff984add172f66855447e0857e79 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.21.1",
+    "version":"3.22.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",