diff --git a/website/BUGS.html b/website/BUGS.html
index 33fda563..11eda4e2 100644
--- a/website/BUGS.html
+++ b/website/BUGS.html
@@ -35,7 +35,7 @@
 	  supposedly fixed in later versions. Bugs listed in the
 	  topmost section may also exist in older versions.</i></p>
 
-      <h2>Latest (recoll 1.11.2 + xapian 1.0.x)</h2>
+      <h2>Latest (recoll 1.11.4 + xapian 1.0.x)</h2>
       <ul>
 
 	<li>Performing a full index with release 1.11, over a version
@@ -115,7 +115,7 @@
 	  yet inexistant db).</li>
       </ul>
 
-      <h2>1.11.1</h2>
+      <h2><a name="b_1_11_1">1.11.1</a></h2>
       <ul>
 	<li>Unicode space characters like 
 	  <em>0x3000,&nbsp;Ideographic&nbsp;space</em>
@@ -125,6 +125,18 @@
 	  would have succeeded.</li>
 	<li>Spaces were inserted inside CJK strings when building
 	  abstracts for the result list.</li>
+	<li>Accent removal should not be performed for Japanese.</li>
+	<li>When using the query language, an OR part with more than
+	  two terms will swallow preceding AND terms, one for each
+	  additional OR. Ex: (champagne ext:odt OR ext:sxw OR ext:lyx)
+	  will be interpreted as 
+	      "champagne OR ext:odt OR ext:sxw OR ext:lyx"
+	  instead of the correct
+	      "champagne AND (ext:odt OR ext:sxw OR ext:lyx)"
+	  Workaround until the fix is issued: add non-existing terms
+	  before the OR part and check the resulting query: 
+	      "champagne bogusxyztv ext:odt OR ext:sxw OR ext:lyx"
+	</li>
       </ul>
 
       <h2>1.10.6</h2>
diff --git a/website/BUGS.txt b/website/BUGS.txt
index 33fda563..11eda4e2 100644
--- a/website/BUGS.txt
+++ b/website/BUGS.txt
@@ -35,7 +35,7 @@
 	  supposedly fixed in later versions. Bugs listed in the
 	  topmost section may also exist in older versions.</i></p>
 
-      <h2>Latest (recoll 1.11.2 + xapian 1.0.x)</h2>
+      <h2>Latest (recoll 1.11.4 + xapian 1.0.x)</h2>
       <ul>
 
 	<li>Performing a full index with release 1.11, over a version
@@ -115,7 +115,7 @@
 	  yet inexistant db).</li>
       </ul>
 
-      <h2>1.11.1</h2>
+      <h2><a name="b_1_11_1">1.11.1</a></h2>
       <ul>
 	<li>Unicode space characters like 
 	  <em>0x3000,&nbsp;Ideographic&nbsp;space</em>
@@ -125,6 +125,18 @@
 	  would have succeeded.</li>
 	<li>Spaces were inserted inside CJK strings when building
 	  abstracts for the result list.</li>
+	<li>Accent removal should not be performed for Japanese.</li>
+	<li>When using the query language, an OR part with more than
+	  two terms will swallow preceding AND terms, one for each
+	  additional OR. Ex: (champagne ext:odt OR ext:sxw OR ext:lyx)
+	  will be interpreted as 
+	      "champagne OR ext:odt OR ext:sxw OR ext:lyx"
+	  instead of the correct
+	      "champagne AND (ext:odt OR ext:sxw OR ext:lyx)"
+	  Workaround until the fix is issued: add non-existing terms
+	  before the OR part and check the resulting query: 
+	      "champagne bogusxyztv ext:odt OR ext:sxw OR ext:lyx"
+	</li>
       </ul>
 
       <h2>1.10.6</h2>
diff --git a/website/CHANGES.html b/website/CHANGES.html
index 05fa5623..e0431dc5 100644
--- a/website/CHANGES.html
+++ b/website/CHANGES.html
@@ -31,11 +31,11 @@
 
       <h1>Recoll journal of user-visible changes </h1>
 
-      <h2><a name="1.11.0">1.11.2</a></h2>
+      <h2><a name="1.11.4">1.11.4</a></h2>
       <ul>
 
-	<li>Bugs fixed: process non-ascii space characters inside
-	  user entries. Don't insert spaces in CJK result list abstracts.</li>  
+	<li>Bugs fixed:
+	  check the <a href="BUGS.html#b_1_11_1">list</a>.</li>  
 
 	<li>The right-click menu "Copy" commands inside the result list
 	  now copy to the clipboard in addition to the main selection,
diff --git a/website/doc.html b/website/doc.html
index 7897446c..2fe8cef1 100644
--- a/website/doc.html
+++ b/website/doc.html
@@ -45,6 +45,9 @@
       <ul>
       <li><a href="perfs.html">Index size and indexing performance
 	      data.</a></li> 
+      <li><a href="howtos/index.html"><em>How to</em></a>
+	documents. These describe in detail how to perform a number of
+	specific tasks.</li>
       </ul>
 
       
diff --git a/website/download.html b/website/download.html
index b60914fb..6f040565 100644
--- a/website/download.html
+++ b/website/download.html
@@ -100,8 +100,8 @@
 
       <h2><a name="source">Source</a></h2>
 
-      <p><b>Current version:</b>1.11.2: 
-	<a href="recoll-1.11.2.tar.gz">recoll-1.11.2.tar.gz</a>.
+      <p><b>Current version:</b>1.11.4: 
+	<a href="recoll-1.11.4.tar.gz">recoll-1.11.4.tar.gz</a>.
 	<a href="CHANGES.html">Changes</a>. <a href="BUGS.html">Bugs</a>.
 	<br>
 	
diff --git a/website/index.html.en b/website/index.html.en
index 0d27940b..145d2a9d 100644
--- a/website/index.html.en
+++ b/website/index.html.en
@@ -47,7 +47,7 @@
 
       <p><span class="application">Recoll</span> is free, open source,
 	and licensed under the GPL. The current version is
-	<a class="important" href="download.html">1.11.2</a> 
+	<a class="important" href="download.html">1.11.4</a> 
 	(<a href="CHANGES.txt">Changes</a>).</p>
 
       <h2>Features: </h2>
diff --git a/website/index.html.fr b/website/index.html.fr
index c4cd3c7d..0ad3bf57 100644
--- a/website/index.html.fr
+++ b/website/index.html.fr
@@ -48,7 +48,7 @@
       <p><span class="application">Recoll</span> est un logiciel libre
 	gratuit, dont le code source est disponible sous licence GPL. 
 	La dernière version est 
-	<a class="important" href="download.html">1.11.2</a></p>
+	<a class="important" href="download.html">1.11.4</a></p>
 
       <p>L'interface utilisateur de 
 	<span class="application">Recoll</span> est traduite en
diff --git a/website/xapUpg100.html b/website/xapUpg100.html
new file mode 100644
index 00000000..f4c4bd33
--- /dev/null
+++ b/website/xapUpg100.html
@@ -0,0 +1,69 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+  <head>
+    <title>Upgrading to xapian 1.0.x</title>
+
+    <meta name="generator" content="HTML Tidy, see www.w3.org">
+    <meta name="Author" content="Jean-Francois Dockes">
+    <meta name="Description" content=
+    "Upgrading a recoll installation from xapian 0.9 to 1.0">
+    <meta name="Keywords" content="recoll, xapian, upgrade">
+    <meta http-equiv="Content-language" content="en">
+    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+    <meta name="robots" content="All,Index,Follow">
+
+    <link type="text/css" rel="stylesheet" href="styles/style.css">
+  </head>
+
+  <body>
+    
+    <div class="rightlinks">
+      <ul>
+	<li><a href="index.html">Home</a></li>
+	<li><a href="download.html">Downloads</a></li>
+      </ul>
+    </div>
+    
+    <div class="content">
+
+      <h1>Upgrading to Xapian 1.0</h1>
+      
+      <p>Xapian has supported two main index formats for quite some
+	time: the older <em>Quartz</em> format, and the
+	newer <em>Flint</em></p>
+
+      <p>Up to Xapian release 1.0, <em>Quartz</em> was the
+	default. This is also quite probably what your Recoll index
+	used, except if you had explicitely required a <em>Flint</em>
+	index by setting the <tt>XAPIAN_PREFER_FLINT</tt> environment
+	variable.</p> 
+
+      <p>When upgrading an existing Recoll installation to Recoll 1.9,
+	which is normally built with Xapian 1.0 (0.9 is still
+	supported), or after rebuilding Recoll 1.8.2 with Xapian 1.0,
+	you probably want to convert your index format
+	to <em>Flint</em>, which is faster and more efficient (if you
+	were using the default <em>Quartz</em>, you can also elect to
+	just do nothing, the older <em>Quartz</em> format is still
+	supported).</p>
+
+      <p>The index format upgrade will not happen automatically, and
+	you will need to destroy the old index explicitely, then
+	restart the indexer (this will cause a full indexing pass, of
+	course, which may take some time, so you may prefer to let it
+	work overnight).</p>
+      
+      <p>To destroy the old index, you just need to erase the xapiandb
+	directory: typically: rm -rf ~/.recoll/xapiandb, except if you
+	specified a special storage place with the <tt>dbdir</tt>
+	configuration variable.</p>
+
+      <p>If you were using <em>Flint</em> with Xapian 0.9,
+	you <em>must</em> destroy the old index,
+	because <em>Flint</em> had an incompatible format change
+	between 0.9 and 1.0</p>
+
+    </div>
+  </body>
+</html>