diff --git a/website/BUGS.html b/website/BUGS.html
index 11eda4e2..60914741 100644
--- a/website/BUGS.html
+++ b/website/BUGS.html
@@ -49,42 +49,45 @@
 	<li> When Recoll is built with qt 4.4.0, the icons in the
 	  result list are all displayed at the top of the page and
 	  garbled. This appears to be a qt bug, fixed in 4.4.1. Use
-	  either qt 4.3.x or 4.4.1
+	  either qt 4.3.x or 4.4.1</li>
 
 	<li> If the user-chosen result list entry format results in
 	  several paragraphs (in the qt textedit sense), right clicks
-	  will only work inside the first one for each entry.
-
-	  <li>The "Copy file name" and "Copy URL" entries of the
-	  right-click menus only copy the data to the X11 primary
-	  selection (use middle-button click to paste). This is
-	  probably a mistake, the data should be copied to the
-	  clipboard too (permitting the use of the "Paste" edit menu
-	  entry or Ctrl+V in the target).
+	  will only work inside the first one for each entry.</li>
 
 	<li> When a mime type has an external viewer defined, but the
 	  actual file is compressed (ie: xxx.txt.gz), recoll will try
 	  to start the external viewer on the compressed file, which
-	  will not work in most cases.
+	  will not work in most cases.</li>
 
-	<li> NEAR crashes: 1.6 has added NEAR searches. Unlike what
-	  recoll did with PHRASES, stemming expansion is performed on
-	  terms inside NEAR clauses (except if prevented by a
-	  capitalized entry of course). There is a bug in Xapian (all
-	  versions as far as I know), where NEAR does not support
-	  multiple OR subclauses, as would result from a multiple
-	  expansion. This manifests itself by a 'not implemented'
-	  Xapian exception. Workarounds:
+	<li>NEAR expansion errors: recoll performs stemming expansion
+	  inside NEAR clauses (except if prevented by a capitalized
+	  entry). Because of a Xapian bug (at least up to 1.0.10),
+	  NEAR does not support multiple OR subclauses. This manifests
+	  itself by a 'not implemented' Xapian exception or an
+	  explicit error message. Workarounds:
 	  <ul>
 	    <li>Prevent expansion of NEAR terms (possibly except one) by
               capitalizing them.
 
 	    <li>Or apply the following patch to xapian, inside the
-              "api/" directory: 
-              http://www.recoll.org/xapian/xapNearDistrib-1.0.patch
-              or fetch the already patched source:
-	      http://www.recoll.org/xapian/xapian-core-1.0.7-recollNEARpatch.tar.gz
-              then recompile, and install.
+              "api/" directory:<br>
+	      0.x versions:
+              <a href="xapian/xapNearDistrib-0.x.patch">
+		xapian/xapNearDistrib-0.x.patch</a>
+	      <br>
+	      1.0.[0-9]:
+              <a href="xapian/xapNearDistrib-1.0.0_9.patch">
+		xapian/xapNearDistrib-1.0.0_9.patch</a>
+	      <br>
+	      1.0.10:
+              <a href="xapian/xapNearDistrib-1.0.10.patch">
+		xapian/xapNearDistrib-1.0.10.patch</a>
+	      <br>
+
+              or fetch the already patched source from
+	      <a href="xapian/">xapian/</a>
+	      then recompile, and install. 
 	    </li>
 	  </ul>
 
@@ -97,7 +100,7 @@
 	  instance, try changing the result list font in the query
 	  preferences. This is not a recoll problem, I don't know the
 	  exact cause (I've seen it happen with "Sans Serif" and go
-	  away with Helvetica or Arial).
+	  away with Helvetica or Arial).</li>
 
 	<li> Under some versions of KDE (ie: Fedora FC5 KDE
 	  3.5.4-0.5.fc5), there is a problem with the window stacking
@@ -106,13 +109,27 @@
 	  window, possibly making it invisible. This is quite probably
 	  a Kwin bug, possibly related to
 	  http://bugs.kde.org/show_bug.cgi?id=79183 or a correction
-	  thereof.
+	  thereof.</li>
 
 	<li> Under Solaris, it is necessary to perform initial indexing with the
 	  recollindex program (the recoll index thread doesn't work for creating
 	  the database). Don't know the reason. Only idea I have is problem with
 	  exception handling (recoll catches an exception while trying the
 	  yet inexistant db).</li>
+	
+	<li>The default filter for files in microsoft word format
+	  (application/msword, .doc), antiword, has trouble with some
+	  relatively rare files with a very small text, resulting in the
+	  following error message:
+	  <blockquote>
+  	     I'm afraid the text stream of this file is too small to
+  	     handle.
+	  </blockquote>
+	  Only small files produced by Microsoft Word on a Mac, or by
+	  OpenOffice will trigger this message. As a workaround, install
+	  wvWare and modify mimeconf to use the rcldoc filter, which
+	  will use vwWare if it is available. This will result in
+	  slower indexing for doc files.</li>
       </ul>
 
       <h2><a name="b_1_11_1">1.11.1</a></h2>
@@ -137,6 +154,13 @@
 	  before the OR part and check the resulting query: 
 	      "champagne bogusxyztv ext:odt OR ext:sxw OR ext:lyx"
 	</li>
+	<li>The "Copy file name" and "Copy URL" entries of the
+	  right-click menus only copy the data to the X11 primary
+	  selection (use middle-button click to paste). This is
+	  probably a mistake, the data should be copied to the
+	  clipboard too (permitting the use of the "Paste" edit menu
+	  entry or Ctrl+V in the target).</li>
+
       </ul>
 
       <h2>1.10.6</h2>
diff --git a/website/CHANGES.html b/website/CHANGES.html
index e0431dc5..68393e4e 100644
--- a/website/CHANGES.html
+++ b/website/CHANGES.html
@@ -30,6 +30,41 @@
     <div class="content">
 
       <h1>Recoll journal of user-visible changes </h1>
+      <h2><a name="1.12.0">1.11.4</a></h2>
+      <ul>
+	<li>Implemented Recoll KIO slave to allow searching directly
+	  from KDE applications. This does not affect the main
+	  application and is not enabled by default (go to the
+	  kde/kio/recoll source directory for build
+	  instructions). </li>
+	<li>Compute md5 checksums for all documents and optionally
+	  collapse duplicate entries inside the result list. Needs a
+	  full reindex to become effective for older documents already
+	  in the index. The option for collapsing or not is in the
+	  <i>Query Configuration</i>.</li>
+	<li>Words glued by an underscore character like
+	  <i>compound_word</i> are now split during indexing, and
+	  will be found when queried either as themselves or in a
+	  search for the components.</li>
+	<li>Add size limit over which no attempt will be made to
+	  uncompress/identify/index compressed files. Not active by
+	  default, to be set in the <i>Indexing Configuration</i>.</li>
+	<li>Fixed possibly harmful bug in strerror_r usage (GNU
+	  case).</li>
+	<li>Added support for fetching field values from extended file
+	  attributes.</li> 
+	<li>Added an entry to the result list right click menu to
+	  save the document to a file. This is only enabled for
+	  documents contained inside another file (ie, messages inside
+	  an mbox folder or attachments), and is especially useful for
+	  extracting an attachment with no associated external
+	  editor.</li>
+	<li>Added a right click menu to the preview window, with an
+	  entry to toggle between viewing the main text or all the
+	  metadata for the document. This is most useful in the case
+	  where the search match actually occurred in a field not
+	  visible in the main text (ie: author or HTML title).</li>
+      </ul>
 
       <h2><a name="1.11.4">1.11.4</a></h2>
       <ul>
diff --git a/website/features.html b/website/features.html
index 873e31ab..6b80ba0b 100644
--- a/website/features.html
+++ b/website/features.html
@@ -38,11 +38,11 @@
 	<dt><a name="systems">Supported systems</a></dt>
 	<dd><span class="application">Recoll</span> has been compiled and
 	  tested on FreeBSD, Linux, Darwin and Solaris (versions
-	  FreeBSD 5.5, Redhat 7.3, Fedora Core 5, Suse 10.1, Gentoo,
-	  Debian 3.1, Solaris 8/9, but other not too distant releases
-	  should be ok too).</dd>
+	  FreeBSD 5/6, Redhat 7/8/9, Fedora Core 5/6/7, Suse 10/11,
+	  Gentoo, Debian 3.1, Solaris 8/9/10. Other not too distant
+	  releases should be ok too).</dd>
 
-	<dd>Qt versions from 3.1</dd>
+	<dd>Qt versions from 3.1 to 4.4</dd>
 
         <dt><a name="doctypes">Document types</a></dt>
 	<dd>Supports the following document types (along with their
@@ -57,21 +57,24 @@
 
                 <li><span class="literal">html</span>.</li>
 
+                <li><span class="literal">maildir</span> and <span
+		    class="literal">mailbox</span> (<span class=
+		    "literal">Mozilla</span>, <span class=
+		    "literal">Thunderbird</span> and <span class=
+		    "literal">Evolution</span> mail ok).</li>
+
                 <li><span class="literal">OpenOffice</span>
                 files (needs <span class="command">unzip</span> command).</li>
 
+                <li><span class="literal">Microsoft Office Open XML</span>
+                files (needs <span class="command">unzip</span> command).</li>
+
                 <li><span class="literal">Abiword</span>
                 files.</li>
 
                 <li><span class="literal">Kword</span>
                 files.</li>
 
-                <li><span class="literal">maildir</span> and <span
-		    class="literal">mailbox</span> (<span class=
-		    "literal">Mozilla</span>, <span class=
-		    "literal">Thunderbird</span> and <span class=
-		    "literal">Evolution</span> mail ok).</li>
-
                 <li><span class="literal">gaim</span> log files.</li>
 
                 <li><span class="literal">Lyx</span> files (needs
@@ -146,11 +149,15 @@
 	<dt>Other features</dt>
 	<dd>
 	  <ul>
+	    <li>Processes all email attachments.</li>
+
 	    <li>Multiple selectable databases.</li>
 
 	    <li>Powerful query facilities, with boolean searches,
 	      phrases, filter on file types and directory tree.</li>
 
+	    <li>Xesam-compatible query language.</li>
+
 	    <li>Specific file name searches with wildcards.</li>
 
 	    <li>Support for multiple charsets. Internal processing and
diff --git a/website/index.html.en b/website/index.html.en
index 145d2a9d..c3a9a11e 100644
--- a/website/index.html.en
+++ b/website/index.html.en
@@ -48,7 +48,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.4</a> 
-	(<a href="CHANGES.txt">Changes</a>).</p>
+	(<a href="CHANGES.html">Changes</a>).</p>
 
       <h2>Features: </h2>
 
@@ -57,14 +57,15 @@
 	  web server, desktop environment or exotic language necessary.</li>
 	<li>Will run on most unix-based <a
 	    href="features.html#systems">systems</a></li> 
-        <li>QT-based GUI.</li>
+        <li>Qt-based GUI. Can use either Qt 3 or Qt 4.</li>
 
-        <li>Supports most common <a
-	    href="features.html#doctypes">document types.</a></li>
+        <li>Searches most common 
+	  <a href="features.html#doctypes">document types</a>, emails and
+	    their attachments.</li>
 
         <li>Powerful query facilities, with boolean searches,
 	  phrases, proximity, wildcards, filter on file types and directory
-	  tree.</li>
+	  tree. </li>
 
         <li>Multi-language and multi-character set with Unicode based
 	  internals.</li> 
@@ -79,7 +80,7 @@
 
       <h2>News: </h2>
       <ul>
-	<li>2008-10-14 : <a href="download.html#source">1.11.0</a> is
+	<li>2008-12-22 : <a href="download.html#source">1.11.4</a> is
 	  out.</li> 
 	<li>2008-09-01 : <a href="filters/filters.html">A new
 	    filter</a> for Office Open XML formats (docx ...).</li>
diff --git a/website/index.html.fr b/website/index.html.fr
index 0ad3bf57..a95c5782 100644
--- a/website/index.html.fr
+++ b/website/index.html.fr
@@ -69,10 +69,11 @@
 	  Unix.</li> 
 
         <li>Interface conçue avec <a href="http://www.trolltech.com">
-	    QT</a>.</li> 
+	    Qt</a>. Peut utiliser la version 3 ou 4.</li> 
 
         <li>Traite la plupart des <a href="fr/features.html#doctypes">
-	    types de document</a> courants.</li>
+	    types de document</a> courants, les messages et leurs fichiers
+	    attachés.</li>
 
         <li>Fonctions de recherche puissantes, avec expressions Booléennes,
         phrases et proximité, wildcards, filtrage sur les types de fichiers
@@ -93,8 +94,8 @@
 
       <h2>Nouvelles: </h2>
       <ul>
-	<li>2008-10-14 : la version 
-	<a href="download.html#source">1.11.0</a> vient de sortir.</li> 
+	<li>2008-12-22 : la version 
+	<a href="download.html#source">1.11.4</a> vient de sortir.</li> 
 
 	<li>2008-09-01 : <a href="filters/filters.html">Un nouveau
 	    filtre</a> pour les formats Office Open XML (docx ...).</li>
diff --git a/website/pics/index.html b/website/pics/index.html
index 47d9c918..55610f96 100644
--- a/website/pics/index.html
+++ b/website/pics/index.html
@@ -1,30 +1,19 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-    <title>Recoll Screenshots</title>
-    <link type="text/css" rel="stylesheet" href="../styles/style.css">
+    <title>Photos</title>
   </head>
   <body>
-    <body>
-      <div class="rightlinks">
-        <ul>
-          <li><a href="../index.html">Home</a></li>
-          <li><a href="../download.html">Downloads</a></li>
-          <li><a href="../usermanual/index.html">User manual</a></li>
-        </ul>
-      </div>
-
-      <div class="content">
-        <h1>Recoll screenshots</h1>
-        <a href="recoll0.html"><img src="recoll0-thumb.png"></a>
-        <a href="recoll1.html"><img src="recoll1-thumb.png"></a>
-        <a href="recoll2.html"><img src="recoll2-thumb.png"></a>
-        <a href="recoll3.html"><img src="recoll3-thumb.png"></a>
-        <a href="recoll4.html"><img src="recoll4-thumb.png"></a>
-        <a href="recoll5.html"><img src="recoll5-thumb.png"></a>
-        <a href="recoll-HTML_search_results.html">
-	  <img src="recoll-HTML_search_results-thumb.png"></a>
-      </div>
-    </body>
-</html>
-
+<table>
+<tr>
+        <td align="center"><a href="recoll0.html"><img src="recoll0-thumb.png"></a></td>
+        <td align="center"><a href="recoll1.html"><img src="recoll1-thumb.png"></a></td>
+        <td align="center"><a href="recoll2.html"><img src="recoll2-thumb.png"></a></td>
+        <td align="center"><a href="recoll3.html"><img src="recoll3-thumb.png"></a></td>
+</tr>
+<tr>
+        <td align="center"><a href="recoll4.html"><img src="recoll4-thumb.png"></a></td>
+        <td align="center"><a href="recoll5.html"><img src="recoll5-thumb.png"></a></td>
+        <td align="center"><a href="recoll_chinese.html"><img src="recoll_chinese-thumb.png"></a></td>
+        <td align="center"><a href="recoll-HTML_search_results.html"><img src="recoll-HTML_search_results-thumb.png"></a></td>
+</tr></table></body></html>
diff --git a/website/pics/recoll-HTML_search_results.html b/website/pics/recoll-HTML_search_results.html
index f4eaf74a..563da3b8 100644
--- a/website/pics/recoll-HTML_search_results.html
+++ b/website/pics/recoll-HTML_search_results.html
@@ -4,7 +4,7 @@
     <title>Photo</title>
   </head>
   <body>
-    <p><a href="recoll_chinese.html">Prev</a> <a href=".">Up</a> 
+    <p><a href="recoll_chinese.html">Prev</a> <a href="index.html">Up</a> 
           <a href="recoll0.html">Next</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 	  <a href="recoll-HTML_search_results.png">Raw Image</a></p>
     <p>A customized result list, thanks to Michael Croes. The html code follows, 
@@ -35,6 +35,6 @@ it should be pasted into the
     &lt;/tr>
 &lt;/table>
 </pre></p>
-    <p><img height="90%" src=recoll-HTML_search_results.png></p>
+    <p><img height="90%" src="recoll-HTML_search_results.png"></p>
   </body>
 </html>
diff --git a/website/pics/recoll0.html b/website/pics/recoll0.html
index 47a09151..3bbae907 100644
--- a/website/pics/recoll0.html
+++ b/website/pics/recoll0.html
@@ -4,10 +4,10 @@
     <title>Photo</title>
   </head>
   <body>
-    <p><a href=".">Prev</a> <a href=".">Up</a> 
+    <p><a href="index.html">Prev</a> <a href="index.html">Up</a> 
           <a href="recoll1.html">Next</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 	  <a href="recoll0.png">Raw Image</a></p>
-    <p>A result list with the mime type icons feature turned on.</p>
-    <p><img height="90%" src=recoll0.png></p>
+    <p>Search results.</p>
+    <p><img height="90%" src="recoll0.png"></p>
   </body>
 </html>
diff --git a/website/pics/recoll0.txt b/website/pics/recoll0.txt
index 83339200..9009b211 100644
--- a/website/pics/recoll0.txt
+++ b/website/pics/recoll0.txt
@@ -1 +1,2 @@
-A result list with the mime type icons feature turned on.
+Search results.
+
diff --git a/website/pics/recoll1.html b/website/pics/recoll1.html
index b95afe7e..09179f32 100644
--- a/website/pics/recoll1.html
+++ b/website/pics/recoll1.html
@@ -4,10 +4,10 @@
     <title>Photo</title>
   </head>
   <body>
-    <p><a href="recoll0.html">Prev</a> <a href=".">Up</a> 
+    <p><a href="recoll0.html">Prev</a> <a href="index.html">Up</a> 
           <a href="recoll2.html">Next</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 	  <a href="recoll1.png">Raw Image</a></p>
     <p>A result list with a preview window open.</p>
-    <p><img height="90%" src=recoll1.png></p>
+    <p><img height="90%" src="recoll1.png"></p>
   </body>
 </html>
diff --git a/website/pics/recoll2.html b/website/pics/recoll2.html
index 5745e3b6..5c186bf1 100644
--- a/website/pics/recoll2.html
+++ b/website/pics/recoll2.html
@@ -4,10 +4,10 @@
     <title>Photo</title>
   </head>
   <body>
-    <p><a href="recoll1.html">Prev</a> <a href=".">Up</a> 
+    <p><a href="recoll1.html">Prev</a> <a href="index.html">Up</a> 
           <a href="recoll3.html">Next</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 	  <a href="recoll2.png">Raw Image</a></p>
     <p>The advanced search dialog.</p>
-    <p><img height="90%" src=recoll2.png></p>
+    <p><img height="90%" src="recoll2.png"></p>
   </body>
 </html>
diff --git a/website/pics/recoll3.html b/website/pics/recoll3.html
index fd10b538..2770fe88 100644
--- a/website/pics/recoll3.html
+++ b/website/pics/recoll3.html
@@ -4,11 +4,11 @@
     <title>Photo</title>
   </head>
   <body>
-    <p><a href="recoll2.html">Prev</a> <a href=".">Up</a> 
+    <p><a href="recoll2.html">Prev</a> <a href="index.html">Up</a> 
           <a href="recoll4.html">Next</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 	  <a href="recoll3.png">Raw Image</a></p>
     <p>A result list from which the native application (firefox)
 was started by clicking the Edit link.</p>
-    <p><img height="90%" src=recoll3.png></p>
+    <p><img height="90%" src="recoll3.png"></p>
   </body>
 </html>
diff --git a/website/pics/recoll4.html b/website/pics/recoll4.html
index 9915d5fd..2348500a 100644
--- a/website/pics/recoll4.html
+++ b/website/pics/recoll4.html
@@ -4,11 +4,11 @@
     <title>Photo</title>
   </head>
   <body>
-    <p><a href="recoll3.html">Prev</a> <a href=".">Up</a> 
+    <p><a href="recoll3.html">Prev</a> <a href="index.html">Up</a> 
           <a href="recoll5.html">Next</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 	  <a href="recoll4.png">Raw Image</a></p>
     <p>The document history window looks a little like a result list
 I'm afraid...</p>
-    <p><img height="90%" src=recoll4.png></p>
+    <p><img height="90%" src="recoll4.png"></p>
   </body>
 </html>
diff --git a/website/pics/recoll5.html b/website/pics/recoll5.html
index ad70a970..4bf5bd90 100644
--- a/website/pics/recoll5.html
+++ b/website/pics/recoll5.html
@@ -4,10 +4,10 @@
     <title>Photo</title>
   </head>
   <body>
-    <p><a href="recoll4.html">Prev</a> <a href=".">Up</a> 
+    <p><a href="recoll4.html">Prev</a> <a href="index.html">Up</a> 
           <a href="recoll_chinese.html">Next</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 	  <a href="recoll5.png">Raw Image</a></p>
     <p>The term explorer tool in phonetic mode.</p>
-    <p><img height="90%" src=recoll5.png></p>
+    <p><img height="90%" src="recoll5.png"></p>
   </body>
 </html>
diff --git a/website/pics/recoll_chinese.html b/website/pics/recoll_chinese.html
index a9ceccc5..93765f3c 100644
--- a/website/pics/recoll_chinese.html
+++ b/website/pics/recoll_chinese.html
@@ -4,11 +4,11 @@
     <title>Photo</title>
   </head>
   <body>
-    <p><a href="recoll5.html">Prev</a> <a href=".">Up</a> 
+    <p><a href="recoll5.html">Prev</a> <a href="index.html">Up</a> 
           <a href="recoll-HTML_search_results.html">Next</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 	  <a href="recoll_chinese.png">Raw Image</a></p>
     <p>Recoll searching Chinese text. Chinese text search is based on n-grams and
 relatively rough, but still useful (I am told).</p>
-    <p><img height="90%" src=recoll_chinese.png></p>
+    <p><img height="90%" src="recoll_chinese.png"></p>
   </body>
 </html>