diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 571caf8e9..12050a5ba 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-06  Corinna Vinschen  <corinna@vinschen.de>
+
+	* faq-setup.xml: Fix entry explaing how the homedir is evaluated
+	according to recent change.
+
 2009-04-07  Corinna Vinschen  <corinna@vinschen.de>
 
 	* setup2.sgml (setup-locale-console): New section to explain
diff --git a/winsup/doc/faq-setup.xml b/winsup/doc/faq-setup.xml
index 6c687a1f6..6f08ba304 100644
--- a/winsup/doc/faq-setup.xml
+++ b/winsup/doc/faq-setup.xml
@@ -342,10 +342,7 @@ in order of decreasing priority:
 <listitem><para>The entry in /etc/passwd
 </para>
 </listitem>
-<listitem><para><literal>HOMEDRIVE</literal> and <literal>HOMEPATH</literal> from the Windows environment
-</para>
-</listitem>
-<listitem><para>/
+<listitem><para>/home/USERNAME
 </para>
 </listitem>
 </orderedlist>