Index: BOOK/boot/64/createfiles.xml
===================================================================
--- BOOK/boot/64/createfiles.xml	(revision 47cb63ded800097debcbedd3227316f382fe4955)
+++ BOOK/boot/64/createfiles.xml	(revision f584773a77da17b1cfdfcb84f48912409efba28d)
@@ -18,5 +18,5 @@
   the next chapter after the software has been installed.</para>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
 ln -sv /tools/bin/file ${CLFS}/usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
Index: BOOK/boot/64/shadow.xml
===================================================================
--- BOOK/boot/64/shadow.xml	(revision 47cb63ded800097debcbedd3227316f382fe4955)
+++ BOOK/boot/64/shadow.xml	(revision f584773a77da17b1cfdfcb84f48912409efba28d)
@@ -66,4 +66,12 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
   </sect2>
 
Index: BOOK/boot/common/createfiles.xml
===================================================================
--- BOOK/boot/common/createfiles.xml	(revision 47cb63ded800097debcbedd3227316f382fe4955)
+++ BOOK/boot/common/createfiles.xml	(revision f584773a77da17b1cfdfcb84f48912409efba28d)
@@ -16,5 +16,5 @@
   the next chapter after the software has been installed.</para>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
 ln -sv /tools/bin/file ${CLFS}/usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
Index: BOOK/boot/common/shadow.xml
===================================================================
--- BOOK/boot/common/shadow.xml	(revision 47cb63ded800097debcbedd3227316f382fe4955)
+++ BOOK/boot/common/shadow.xml	(revision f584773a77da17b1cfdfcb84f48912409efba28d)
@@ -48,14 +48,18 @@
   </variablelist>
 
+    <para os="h">Tell Shadow to use passwd in /tools/bin:</para>
 
-    <para os="h">Compile the package:</para>
+<screen os="i"><userinput>cp config.h{,.orig}
+sed '/PASSWD_PROGRAM/s@/bin/passwd@/tools&amp;@' config.h.orig &gt; config.h</userinput></screen>
 
-<screen os="i"><userinput>make</userinput></screen>
+    <para os="j">Compile the package:</para>
 
-    <para os="j">This package does not come with a test suite.</para>
+<screen os="k"><userinput>make</userinput></screen>
 
-    <para os="k">Install the package:</para>
+    <para os="l">This package does not come with a test suite.</para>
 
-<screen os="l"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+    <para os="m">Install the package:</para>
+
+<screen os="n"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/boot/mips64/createfiles.xml
===================================================================
--- BOOK/boot/mips64/createfiles.xml	(revision 47cb63ded800097debcbedd3227316f382fe4955)
+++ BOOK/boot/mips64/createfiles.xml	(revision f584773a77da17b1cfdfcb84f48912409efba28d)
@@ -15,5 +15,5 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
 ln -sv /tools/bin/file ${CLFS}/usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
Index: BOOK/boot/multilib/createfiles.xml
===================================================================
--- BOOK/boot/multilib/createfiles.xml	(revision 47cb63ded800097debcbedd3227316f382fe4955)
+++ BOOK/boot/multilib/createfiles.xml	(revision f584773a77da17b1cfdfcb84f48912409efba28d)
@@ -15,5 +15,5 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
 ln -sv /tools/bin/file ${CLFS}/usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
