diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh
index ecb757cb..cc86724e 100644
--- a/packaging/debian/buildppa.sh
+++ b/packaging/debian/buildppa.sh
@@ -7,7 +7,7 @@
 RCLVERS=1.22.0
 LENSVERS=1.19.10.3543
 SCOPEVERS=1.20.2.4
-PPAVERS=1
+PPAVERS=3
 
 # 
 RCLSRC=/y/home/dockes/projets/fulltext/recoll/src
@@ -41,7 +41,7 @@ check_recoll_orig()
 ####### QT4
 debdir=debian
 # Note: no new releases for lucid: no webkit. Or use old debianrclqt4 dir.
-#series="precise trusty vivid"
+series="precise trusty utopic vivid wily xenial"
 series=trusty
 
 if test "X$series" != X ; then
@@ -70,7 +70,7 @@ for series in $series ; do
 done
 
 ### KIO
-series="precise trusty vivid"
+series="precise trusty utopic vivid wily xenial"
 series=
 
 debdir=debiankio
@@ -140,7 +140,7 @@ for series in $series ; do
 done
 
 ### Unity Scope
-series="trusty vivid"
+series="trusty utopic vivid wily xenial"
 series=
 
 debdir=debianunityscope
diff --git a/website/download.html b/website/download.html
index 8d8046fa..b79200d4 100644
--- a/website/download.html
+++ b/website/download.html
@@ -123,6 +123,13 @@
 
         <p><a href="recoll-1.21.6.tar.gz">recoll-1.21.6.tar.gz</a>.</p>
 
+        <h3>1.22.0:</h3>
+
+        <p>As with any .0 release, don't use this is you absolutely
+          don't want to run into trouble:</p>
+        <p><a href="recoll-1.22.0.tar.gz">recoll-1.22.0.tar.gz</a>.</p>
+        <p><a href="release-1.22.html">The release notes</a>.</p>
+
         <!--
         <h3>Snapshot</h3>
         <p>I sometimes release a source tarfile when I consider that the
diff --git a/website/index.html.en b/website/index.html.en
index 943c09b4..20ed99d7 100644
--- a/website/index.html.en
+++ b/website/index.html.en
@@ -98,6 +98,11 @@
       
       <dl>
 
+        <dt>2016-04-14</dt><dd>Release 1.22.0 is now available from
+          the download area. The binary packages should wait until
+          enough brave souls have tested it. See
+          the <a href="release-1.22.html">the release notes</a>.</dd>
+
         <dt>2016-04-07</dt><dd>Release 1.21.6  adds KDE5 compatibility
           for the KIO slave.</dd>
         
diff --git a/website/pages/recoll-windows.txt b/website/pages/recoll-windows.txt
index 2fce6724..a96238df 100644
--- a/website/pages/recoll-windows.txt
+++ b/website/pages/recoll-windows.txt
@@ -1,10 +1,12 @@
 = Recoll on Windows
 Jean-Francois Dockes <jf at dockes.org>
 
+:recollversion: 1.22.0-20160414
+
 image:recoll-windows10-thumb.png[link="recoll-windows10.png"]
 
 Recoll for Windows was built on Windows 7, and tried on Windows 7 and
-10. It now seems quite stable (12 November 2015)
+10. It now seems quite stable (14 April 2016)
 
 Recoll is free and licensed under the GPL. You will be asked to accept the
 license during the installation. For a regular user, and in a nutshell, the
@@ -18,23 +20,33 @@ more useful ? You can use the Disqus comments section at the bottom of this
 page, send an email, or use the
 https://bitbucket.org/medoc/recoll/issues[BitBucket Recoll issues tracker].
 
-NOTE: Especially, I would very much like information about system
-compatibility. It seems that Recoll does not work on Windows XP, and there is
-little I can do about it. I know that it runs on Windows 7 32 bits, and
-Windows 10 64 bits (my two Virtualbox instances). I have a report that the
-installer crashes on Windows 7 64 bits, but I would really like more data
-points. Please send me news of your success or failure.
+NOTE: Especially, I would like information about system compatibility. It
+seems that Recoll does not work on Windows XP, and there is little I can do
+about it. I know that it runs on Windows 7 32 bits, and Windows 10 64 bits
+(my two Virtualbox instances). I have a report that the installer crashes
+on Windows 7 64 bits, but I would really like more data points. Please send
+me news of your success or failure.
+
+NOTE: About the installer: this needs administrator rights, in order to
+install to `C:\Program Files`. If you want to install on a machine where
+you have no administrator rights, you can use the
+http://www.recoll.org/windows/recoll-archive-{recollversion}.7z[installation
+directory archive] instead and extract it anywhere, this works just the
+same (you will need the free http://www.7-zip.org/[7z] to extract it). If
+you are in this case, you can ignore the setup-related steps of the
+procedure of course.
+
+
 
 Procedure: 
 
 - Download the Recoll setup file from the
-  http://www.recoll.org/windows/recoll-setup-1.22.0-20160317.exe[Recoll
+  http://www.recoll.org/windows/recoll-setup-{recollversion}.exe[Recoll
   web site], or (probably faster) from 
-  https://bitbucket.org/medoc/recoll/downloads/recoll-setup-1.22.0-20160317.exe[BitBucket].
+  https://bitbucket.org/medoc/recoll/downloads/recoll-setup-{recollversion}.exe[BitBucket].
 
 - Execute the setup file. This is a vanilla installer generated by Inno
-  Setup, and it will ask the usual questions. If you have no administrative
-  rights, take care to select a target directory where you can write.
+  Setup, and it will ask the usual questions.
 
 - Download and install
   https://www.python.org/ftp/python/2.7.10/python-2.7.10.msi[Python
@@ -68,6 +80,19 @@ should be specified as `/c/mydir` instead of `c:/mydir`
   create and update the index by using the `File` menu (or executing
   `recollindex.exe` from a command window).
 
+== Change Log
+
+Changes in 20160414
+
+- The setup script has changed back to needing administrator rights,
+  because this is what is convenient for most people. Use the installation
+  directory archive to install in a non-standard location without admin
+  rights.
+- Fixed a bug which had the whole indexing stop if a script would time out
+  on a specific file (it will very rarely happen that a pathologically bad
+  file can throw an input handler in a loop).
+-
+
 Changes in 20160317
 
 - Small change to the setup script so that administrative rights are not
@@ -94,7 +119,6 @@ Changes in 20151202
   in the image tag extractor caused very ennoying Windows popups about
   a Python error.
 
-
 Fixed in 20151115 and later
 
 - A relatively rare crash which seemed to occur mostly on some email
diff --git a/website/release-1.21.html b/website/release-1.21.html
index c6f9c53a..ecc6c872 100644
--- a/website/release-1.21.html
+++ b/website/release-1.21.html
@@ -55,6 +55,35 @@
           see the manual</a>). If you do so, you must then reset the
         index.</p> 
 
+      <h2>Changes in Recoll 1.21.0</h2>
+
+      <ul>
+        <li>Allow saving queries to files and reloading them
+          later. Available both for simple and advanced queries, and
+          based on XML files.</li>
+	<li>A Bison-based query parser replaces the old regexp-based
+	  one and allows parenthized sub-expressions and easier future
+	  expansions.</li>  
+        <li>The GUI gets a "close to system tray" function.</li>
+        <li>Avoid retrying to index previously indexed files if
+          nothing seems to have changed in the filters.</li> 
+        <li>Improve indexing speed by always using vfork() for
+          spawning external commands.</li> 
+        <li>The pdf filter gains the capability to run OCR (tesseract) on
+          image-only files. This happens automatically on image-only
+          pdfs if tesseract is available.</li> 
+        <li>Improved checks about when we should try to uncompress
+          stuff. Will eliminate some of the most dreadful cases of
+          recollindex having an impact on system performance.</li>
+        <li>Warn if non-existent paths are listed in the configuration
+          file (help with typos).</li>
+        <li>Adjust background color for webkit-based elements (result
+          list and snippets window) according to desktop setup.</li>
+        <li>Listing the results with the KIO slave is now
+          performed with incremental updates. Bumped max entries to
+          10000.</li>
+      </ul>
+
       <h2>Minor releases</h2>
       <ul>
         <li>1.21.6:
@@ -116,34 +145,6 @@
         </li>
       </ul>
 
-      <h2>Changes in Recoll 1.21.0</h2>
-
-      <ul>
-        <li>Allow saving queries to files and reloading them
-          later. Available both for simple and advanced queries, and
-          based on XML files.</li>
-	<li>A Bison-based query parser replaces the old regexp-based
-	  one and allows parenthized sub-expressions and easier future
-	  expansions.</li>  
-        <li>The GUI gets a "close to system tray" function.</li>
-        <li>Avoid retrying to index previously indexed files if
-          nothing seems to have changed in the filters.</li> 
-        <li>Improve indexing speed by always using vfork() for
-          spawning external commands.</li> 
-        <li>The pdf filter gains the capability to run OCR (tesseract) on
-          image-only files. This happens automatically on image-only
-          pdfs if tesseract is available.</li> 
-        <li>Improved checks about when we should try to uncompress
-          stuff. Will eliminate some of the most dreadful cases of
-          recollindex having an impact on system performance.</li>
-        <li>Warn if non-existent paths are listed in the configuration
-          file (help with typos).</li>
-        <li>Adjust background color for webkit-based elements (result
-          list and snippets window) according to desktop setup.</li>
-        <li>Listing the results with the KIO slave is now
-          performed with incremental updates. Bumped max entries to
-          10000.</li>
-      </ul>
     </div>
   </body>
 </html>
diff --git a/website/release-1.22.html b/website/release-1.22.html
index 00a2df95..48729275 100644
--- a/website/release-1.22.html
+++ b/website/release-1.22.html
@@ -59,16 +59,44 @@
 
       <ul>
 
-      2015-11-17:
-      - synonyms
-      - python3 compat for most filters. Appropriate shebang lines.
-      - Windows port
-      - New build system
-      - Filters converted to python mexec -> faster in most cases.
-      - Make dehyphenate (co-worker->coworker) optional
-      
+        <li>The main "feature" in recoll 1.22 is that it has
+          a <a href="pages/recoll-windows.html">Microsoft Windows
+            version</a>. This is has been tested on Windows 7 and 
+          Windows 10, and it works mostly like the Unix version, with
+          the notable exceptions that it has no real-time mode (need to
+          start indexing by hand from the GUI, or arrange something with
+          the command-line recollindex.exe). Also there are a few very
+          Unix-y file types which are not processed on Windows, and the
+          indexer is single-threaded.</li>
 
+        <li>Synonyms: users can define term synonyms groups in
+          ordinary text files. They are used only at query times to
+          expand a query to synonym terms.
+          <a href="http://www.lesbonscomptes.com/recoll/usermanual/webhelp/docs/RCL.SEARCH.SYNONYMS.html">
+            More details</a>.</li>
+        
+        <li>Most input handlers are now compatible with
+          Python3. Actually the only ones which are not are kept back by
+          the library they use. Also most external handlers are now
+          persistent, and quite a few shell-script have been converted
+          to Python for use on Windows.</li> 
+
+        <li>The build system has been converted to use the autotools in
+          a fairly standard way. The Windows build is based on Qt
+          Creator and MinGW.</li>
+
+        <li>Make dehyphenation (co-worker->coworker in addition to the
+          normal terms) optional, active by default.</li>
+
+        <li>For people using the Firefox web page indexer add-on: a
+          new tool in the GUI to list and delete entries from the Web
+          cache.</li>
+      
+        <li>Improved index statistics in the GUI, and improved display
+          while the indexer is working.</li>
+        
       </ul>
+
     </div>
   </body>
 </html>