diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 6e38ac0be..2480c5164 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-03  Adam Dinwoodie  <Adam.Dinwoodie@metaswitch.com>
+
+	 * faq-using.xml (faq.using.man): Make relevance to whatis explicit.
+
 2012-07-20  Corinna Vinschen  <corinna@vinschen.de>
 
 	* pathnames.sgml (pathnames-intro): Remove paragraph on UNC paths.
diff --git a/winsup/doc/faq-using.xml b/winsup/doc/faq-using.xml
index 5aee7717b..c08efbc56 100644
--- a/winsup/doc/faq-using.xml
+++ b/winsup/doc/faq-using.xml
@@ -238,10 +238,12 @@ related messages.
 </answer></qandaentry>
 
 <qandaentry id="faq.using.man">
-<question><para>Why doesn't man -k (or apropos) work?</para></question>
+<question><para>Why doesn't <literal>man -k</literal>,
+<literal>apropos</literal> or <literal>whatis</literal> work?</para></question>
 <answer>
 
-<para>Before you can use <literal>man -k</literal> or <literal>apropos</literal>, you
+<para>Before you can use <literal>man -k</literal>, <literal>apropos</literal>
+or <literal>whatis</literal>, you
 must create the whatis database.  Just run the command
 </para>
 <screen>