diff --git a/src/common/textsplit.cpp b/src/common/textsplit.cpp
index fa14dc54..b239eb9e 100644
--- a/src/common/textsplit.cpp
+++ b/src/common/textsplit.cpp
@@ -22,9 +22,8 @@
 
 #include <iostream>
 #include <string>
+#include <algorithm>
 #include <tr1/unordered_set>
-using std::tr1::unordered_set;
-
 #include <cstring>
 
 #include "textsplit.h"
@@ -33,9 +32,9 @@ using std::tr1::unordered_set;
 #include "utf8iter.h"
 #include "uproplist.h"
 
-#ifndef NO_NAMESPACES
+using std::tr1::unordered_set;
 using namespace std;
-#endif /* NO_NAMESPACES */
+
 
 /**
  * Splitting a text into words. The code in this file works with utf-8
diff --git a/src/doc/user/usermanual.sgml b/src/doc/user/usermanual.sgml
index 1120705f..a40c6238 100644
--- a/src/doc/user/usermanual.sgml
+++ b/src/doc/user/usermanual.sgml
@@ -8,7 +8,7 @@
 
 <!ENTITY RCL "<application>Recoll</application>">
 <!ENTITY RCLAPPS "<ulink url='http://www.recoll.org/features.html'>Recoll helper applications page</ulink>">
-<!ENTITY RCLVERSION "1.17">
+<!ENTITY RCLVERSION "1.18">
 <!ENTITY XAP "<application>Xapian</application>">
 ]>
  
@@ -1854,9 +1854,9 @@ fvwm
       </formalpara>
 
       <formalpara><title>Advanced search history</title>
-        <para>You can display any of the last 100 complex searches
-          performed by using the up and down arrow keys while the advanced
-          search panel is active.</para>
+        <para>As of &RCL; 1.18, you can display any of the last 100 complex
+          searches performed by using the up and down arrow keys while the
+          advanced search panel is active.</para>
       </formalpara>
       
       <formalpara><title>Browsing the result list inside a preview 
diff --git a/website/index.html.en b/website/index.html.en
index de2a1163..47664ba9 100644
--- a/website/index.html.en
+++ b/website/index.html.en
@@ -86,6 +86,16 @@
       <h2>News</h2>
       <div class="news">
       <ul>
+        <li>2012-10-16: recoll 1.18 will soon be out. It will have
+          optional character case and diacritics sensitivity, direct
+          access to hit page when opening PDF files, complex search
+          history, and a host of other smaller improvements. You can
+          already see the <a href="release-1.18.html">release
+          notes</a> and the snapshot currently on the 
+          <a href="https://launchpad.net/~recoll-backports/+archive/experiments"> 
+            "experimental" Ubuntu PPA</a> is actually a release
+            candidate, so Ubuntu users can take an early plunge...</li>
+
         <li>2012-09-21: an
           <a href="https://bitbucket.org/medoc/recoll/wiki/ElinksBeagle">easy
                  way</a> to extend the "Beagle queue"