diff --git a/website/devel.html b/website/devel.html
index 22a9be9a..d83e715b 100644
--- a/website/devel.html
+++ b/website/devel.html
@@ -101,8 +101,8 @@
 
       <p>You will find help and information about producing a useful
       problem report on this 
-        <a href="https://bitbucket.org/medoc/recoll/wiki/ProblemSolvingData">
-          Recoll wiki page</a>.</p>
+        <a href="faqsandhowtos/ProblemSolvingData.html">
+          Howto page</a>.</p>
 
     </div>
   </body>
diff --git a/website/doc.html b/website/doc.html
index d52c3097..fec42af4 100644
--- a/website/doc.html
+++ b/website/doc.html
@@ -45,13 +45,12 @@
 
       <p><br></p>
 
-      <h1>Howtos on the Recoll Wiki</h1>
+      <h1>Faqs and Howtos</h1>
 
       <p>You will find a number of useful tips for common
         issues and extensions on the 
-	  <a href="http://bitbucket.org/medoc/recoll/wiki/">
-	    Recoll Wiki</a> on 
-	  <a href="http://bitbucket.org/medoc/recoll">bitbucket.org</a>.</p>
+	  <a href="faqsandhowtos/index.html">
+	    Faqs and Howtos section</a>.
 
       <h1>Other documentation</h1>
 
@@ -65,11 +64,6 @@
       <li><a href="custom.html">Result list format samples.</a></li>
       <li><a href="idxthreads/threadingRecoll.html">Lessons learned
           while modifying Recoll indexing to be multithreaded</a>.</li>
-      <li><a href="http://bitbucket.org/medoc/recoll/wiki/FaqsAndHowTos">
-          Faqs and Howtos</a> are now kept in the 
-	  <a href="http://bitbucket.org/medoc/recoll/wiki/">
-	    Recoll Wiki</a> on 
-	  <a href="http://bitbucket.org/medoc/recoll">bitbucket.org</a>.</li>
       </ul>
 
     </div>
diff --git a/website/faqsandhowtos/FaqsAndHowTos.txt b/website/faqsandhowtos/index.txt
similarity index 93%
rename from website/faqsandhowtos/FaqsAndHowTos.txt
rename to website/faqsandhowtos/index.txt
index 6c0feed7..0bbb2817 100644
--- a/website/faqsandhowtos/FaqsAndHowTos.txt
+++ b/website/faqsandhowtos/index.txt
@@ -1,5 +1,7 @@
 == Faqs and Howtos
 
+link:faqsindex.html[Full file index]
+
 === Indexing
 * link:WhyIsMyFileNotIndexed.html[Why is this file not indexed ? Investigating indexing issues]
 * link:PreventIndexingDir.html[Preventing the indexing of a directory]
@@ -28,7 +30,7 @@
 
 === Administration and miscellaneous
 * link:http://www.recoll.org/pages/recoll-webui-install-wsgi.html.html[Installation of the Recoll WebUI with Apache]
-* link:FilterRetrofit.wiki.html[//Installing a filter for a new document type//]
+* link:FilterRetrofit.wiki.html[Installing a filter for a new document type]
 * link:UnityLens.html[Building and Installing the Ubuntu Unity Recoll Lens]
 * link:SavingConfig.wiki.html[Recoll configuration backup]
 * link:XDGBase.wiki.html[Tidying Recoll data storage]
diff --git a/website/faqsandhowtos/makeindex.sh b/website/faqsandhowtos/makeindex.sh
index f293b0c7..7dceb20f 100644
--- a/website/faqsandhowtos/makeindex.sh
+++ b/website/faqsandhowtos/makeindex.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-WIDX=WikiIndex.txt
+WIDX=faqsindex.txt
 
-echo "== Recoll Wiki file index" > $WIDX
+echo "== Recoll Faqs and Howtos file index" > $WIDX
 for f in *.txt; do
  if test "$f" = $WIDX ; then continue; fi
  h="`basename $f .txt`.html"
diff --git a/website/features.html b/website/features.html
index efbb6431..e7d8d36d 100644
--- a/website/features.html
+++ b/website/features.html
@@ -289,9 +289,8 @@ application/x-tar = execm rcltar
         "http://pypi.python.org/pypi/icalendar/2.1">icalendar</a></span>).</li>
 
         <li><span class="application">Mozilla calendar data</span> See
-        <a href=
-        "http://bitbucket.org/medoc/recoll/wiki/IndexMozillaCalendari">
-        the wiki</a> about this.</li>
+        <a href="faqsandhowtos/IndexMozillaCalendari.html">
+        the Howto</a> about this.</li>
 
         <li><span class="application">postscript</span> with <a href=
         "http://www.gnu.org/software/ghostscript/ghostscript.html">
@@ -379,9 +378,8 @@ application/x-tar = execm rcltar
 
       <ul>
         <li>Can use a Firefox extension to index visited Web pages
-        history. See <a href=
-        "http://bitbucket.org/medoc/recoll/wiki/IndexWebHistory">the
-        Wiki</a> for more detail.</li>
+          history. See <a href="faqsandhowtos/IndexWebHistory.html">the
+            Howto</a> for more detail.</li>
 
         <li>Processes all email attachments, and more generally any
          realistic level of container imbrication (the "msword attachment to
@@ -425,9 +423,10 @@ application/x-tar = execm rcltar
 	<li>The <a href="http://kde-apps.org">recollrunner</a> krunner
 	  module allows integrating Recoll search results into a
 	  krunner query.</li>
-        <li>The Ubuntu Unity Recoll Lens lets you access Recoll search
+        <li>The Ubuntu Unity Recoll Lens (or Scope for newer Unity
+          versions) lets you access Recoll search
           from the Unity Dash. More
-          info <a href="https://bitbucket.org/medoc/recoll/wiki/UnityLens">
+          slightly obsolete information <a href="faqsandhowtos/UnityLens.html">
             here</a>. </li>
         <li>The <a href="http://github.com/medoc92/recoll-webui">Recoll
             Web UI</a> lets you query a Recoll index from a web browser</li>
diff --git a/website/pages/recoll-windows.txt b/website/pages/recoll-windows.txt
index 9795d3f0..5b2716a2 100644
--- a/website/pages/recoll-windows.txt
+++ b/website/pages/recoll-windows.txt
@@ -3,7 +3,7 @@ Jean-Francois Dockes <jf at dockes.org>
 :date:
 
 :recollversion: 1.23.0-2017-01-07-78b8ad
-:windir: downwin-b4615
+:windir: downwin-fa352
 
 image:recoll-windows10-thumb.png[link="recoll-windows10.png"]
 
diff --git a/website/release-1.17.html b/website/release-1.17.html
index 64be99f2..dc3666fa 100644
--- a/website/release-1.17.html
+++ b/website/release-1.17.html
@@ -128,8 +128,7 @@
 
         <li>Desktop: there is a new Ubuntu Unity Recoll Lens, it is not
           installed by default, but quite easy to install, see
-          <a href="https://bitbucket.org/medoc/recoll/wiki/UnityLens">the
-            Wiki page</a>.</li>
+          <a href="faqsandhowtos/UnityLens.html">the Howto page</a>.</li>
 
         <li>GUI: it is now possible to cancel a query that takes too
           long. Because of limitations in Xapian, this forces a program