diff --git a/src/README b/src/README
index 547506b1..839708a0 100644
--- a/src/README
+++ b/src/README
@@ -16,7 +16,7 @@ Recoll
    Unix systems.
 
    Recoll is based on a very strong backend (Xapian), for which it provides
-   an easy to use, feature-rich, easy-administration interface.
+   an easy to use, feature-rich, easy administration interface.
 
    Recoll is free and copyrighted under the GPL license, see COPYING inside
    the distribution. A lot of the code is imported from other packages, see
@@ -24,20 +24,25 @@ Recoll
 
   Features:
 
-     * Document types: text, html, pdf (with pdftotext), postscript (with
-       ghostscript's pstotext), msword (with antiword), openoffice files,
-       maildir and mailbox mail folders (Mozilla and thunderbird mail ok).
-       Deals with compressed versions of same.
-     * Relatively powerful query facilities, with boolean searches, phrases,
-       filter on file types and directory tree.
+     * QT-based GUI.
+     * Supports the following document types:
+          * text.
+          * html.
+          * OpenOffice files.
+          * maildir and mailbox mail folders (Mozilla and Thunderbird mail
+            ok).
+          * pdf (with pdftotext).
+          * postscript (with ghostscript's pstotext).
+          * msword (with antiword).
+       along with their compressed versions.
+     * Powerful query facilities, with boolean searches, phrases, filter on
+       file types and directory tree.
      * Support for multiple charsets. Internal processing and storage uses
        Unicode UTF-8.
      * Stemming performed at query time (can switch stemming language after
        indexing)
      * Easy installation. No database daemon, web server or exotic language
-       necessary. The idea is that everybody should index their files because
-       it makes life easier.
-     * GUI based on qt, written with qt Designer.
+       necessary.
      * An indexer which runs either as a thread inside the GUI or as an
        external, cron'able program.
 
@@ -45,14 +50,21 @@ Recoll
    (versions FreeBSD 5.3, Redhat 7.3, Solaris 8, but other not too distant
    releases should be ok too). You can download the source code here.
 
-  Things lacking, coming in the not too far future:
+  Future evolutions
 
+   Things hopefully coming in the not too far future (especially with some
+   help):
+
+     * Support for the more advanced Xapian concepts like relevance feedback.
      * An interactive configuration tool. You need to edit files by hand for
        now.
      * Packages, rpm or other. It's all tar files currently.
-     * More documentation and help.
+     * A more polished user interface with online help and better
+       documentation.
      * Translations for the user interface.
      * A few more filters for less common file types.
+     * An history tool for queries and documents.
+     * Integration with the KDE desktop.
 
    I very much welcome suggestions or (gasp) code.
 
@@ -80,7 +92,7 @@ Recoll
        package.
      * Iconv, for character set conversion.
      * Binc IMAP for MIME parsing code.
-     * I fear the rest of the bugs to be mostly mine:
+     * I fear that bugs found elsewhere are mostly mine:
        jean-francois.dockes@wanadoo.fr
      * Home
      * Screenshots
@@ -132,7 +144,7 @@ Using Recoll
 
    The advanced search dialog has fields that will allow a more refined
    search, looking for documents with all given words, a given exact phrase,
-   or none of the given words (all fields may be combined by a default AND
+   or none of the given words (all fields may be combined by an implicit AND
    clause).
 
    It will let you search for documents of specific mime types (ie: only
@@ -141,4 +153,4 @@ Using Recoll
    It will let you restrict the search results to a subtree of the indexed
    area.
 
-   In other respects, it works as the simple search.
+   In other respects, it works like the simple search.
diff --git a/src/mk/Linux b/src/mk/Linux
index 264ada03..294385a9 100644
--- a/src/mk/Linux
+++ b/src/mk/Linux
@@ -1,4 +1,5 @@
 include ../mk/commondefs
+include ../mk/localdefs
 
 CXXFLAGS = $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
 	 -D_GNU_SOURCE \