diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9243d4ce9..63541386a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -92,6 +92,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>May 4th, 2004 [winkie]: Chapter 6 - Install the
+<quote>passwd</quote> binary in /bin instead of /usr/bin.</para></listitem>
+
 <listitem><para>May 4th, 2004 [winkie]: Chapter 6 - Switch the uname patch we
 use, so that we get correct results.</para></listitem>
 
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index cba368d08..2bae866ce 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -23,18 +23,7 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed.</para>
 <sect2>
 <title>Installation of Shadow</title>
 
-<para>Shadow hard-wires the path to the <command>passwd</command> binary within
-the binary itself, but does this the wrong way. If a <command>passwd</command>
-binary is not present before installing Shadow, the package incorrectly assumes
-it is going to be located at <filename>/bin/passwd</filename>, but then
-installs it as <filename>/usr/bin/passwd</filename>. This will lead to errors
-about not finding <filename>/bin/passwd</filename>. To work around this bug,
-create a dummy <filename>passwd</filename> file, so that it gets hard-wired
-properly:</para>
-
-<screen><userinput>touch /usr/bin/passwd</userinput></screen>
-
-<para>Now prepare Shadow for compilation:</para>
+<para>Prepare Shadow for compilation:</para>
 
 <screen><userinput>./configure --libdir=/usr/lib --enable-shared</userinput></screen>
 
@@ -75,10 +64,11 @@ and type it all in):</para>
     -e 's%/var/spool/mail%/var/mail%' \
     etc/login.defs.linux &gt; /etc/login.defs</userinput></screen>
 
-<para>Move some misplaced symlinks to their proper locations:</para>
+<para>Move some misplaced symlinks/programs to their proper locations:</para>
 
 <screen><userinput>mv /bin/sg /usr/bin
-mv /bin/vigr /usr/sbin</userinput></screen>
+mv /bin/vigr /usr/sbin
+mv /usr/bin/passwd /bin</userinput></screen>
 
 <para>And move Shadow's dynamic libraries to a more appropriate location:</para>