Index: BOOK/final-system/common/gzip.xml
===================================================================
--- BOOK/final-system/common/gzip.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/common/gzip.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -57,13 +57,15 @@
 <screen os="f"><userinput>make</userinput></screen>
 
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Move the <command>gzip</command> program to the <filename
+    <para os="g">This package does not come with a test suite.</para>
+
+    <para os="h">Install the package:</para>
+
+<screen os="i"><userinput>make install</userinput></screen>
+
+    <para os="j">Move the <command>gzip</command> program to the <filename
     class="directory">/bin</filename> directory and create some commonly
     used symlinks to it:</para>
 
-<screen os="j"><userinput>mv -v /usr/bin/gzip /bin
+<screen os="k"><userinput>mv -v /usr/bin/gzip /bin
 rm -v /usr/bin/{gunzip,zcat}
 ln -sv gzip /bin/{gunzip,zcat,compress}
Index: BOOK/final-system/common/inetutils.xml
===================================================================
--- BOOK/final-system/common/inetutils.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/common/inetutils.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -102,12 +102,14 @@
 <screen os="e"><userinput>make</userinput></screen>
 
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Move the <command>ping</command> program to its FHS-compliant
+    <para os="f">This package does not come with a test suite.</para>
+
+    <para os="g">Install the package:</para>
+
+<screen os="h"><userinput>make install</userinput></screen>
+
+    <para os="i">Move the <command>ping</command> program to its FHS-compliant
     place:</para>
 
-<screen os="i"><userinput>mv -v /usr/bin/ping /bin</userinput></screen>
+<screen os="j"><userinput>mv -v /usr/bin/ping /bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/iproute2.xml
===================================================================
--- BOOK/final-system/common/iproute2.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/common/iproute2.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -67,7 +67,9 @@
     </variablelist>
 
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make SBINDIR=/sbin install</userinput></screen>
+    <para os="f">This package does not come with a test suite.</para>
+
+    <para os="g">Install the package:</para>
+
+<screen os="h"><userinput>make SBINDIR=/sbin install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/common/kbd.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -47,7 +47,9 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
+    <para os="e">This package does not come with a test suite.</para>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/man.xml
===================================================================
--- BOOK/final-system/common/man.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/common/man.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -77,9 +77,11 @@
 <screen os="l"><userinput>make</userinput></screen>
 
-    <para os="m">Install the package:</para>
-
-<screen os="n"><userinput>make install</userinput></screen>
-
-    <note os="o">
+    <para os="m">This package does not come with a test suite.</para>
+
+    <para os="n">Install the package:</para>
+
+<screen os="o"><userinput>make install</userinput></screen>
+
+    <note os="p">
       <para>If you will be working on a terminal that does not support
       text attributes such as color and bold, you can disable Select
@@ -92,12 +94,12 @@
     </note>
 
-    <para os="p">If the character set of the locale uses 8-bit characters, search
+    <para os="q">If the character set of the locale uses 8-bit characters, search
     for the line beginning with <quote>NROFF</quote> in
     <filename>/etc/man.conf</filename>, and verify that it matches the
     following:</para>
 
-<screen os="q">NROFF /usr/bin/nroff -Tlatin1 -mandoc</screen>
-
-    <para os="r">Note that <quote>latin1</quote> should be used even if it is not
+<screen os="r">NROFF /usr/bin/nroff -Tlatin1 -mandoc</screen>
+
+    <para os="s">Note that <quote>latin1</quote> should be used even if it is not
     the character set of the locale. The reason is that, according to the
     specification, <command>groff</command> has no means of typesetting
@@ -111,5 +113,5 @@
     it is usable as the input for a pager.</para>
 
-    <para os="s">This does not solve the problem of a non-working
+    <para os="t">This does not solve the problem of a non-working
     <command>man2dvi</command> program for localized man pages in
     non-ISO 8859-1 locales. Also, it does not work with multibyte
@@ -118,5 +120,5 @@
     not support multibyte character sets.</para>
 
-    <para os="t">Additional information with regards to the compression of
+    <para os="u">Additional information with regards to the compression of
     man and info pages can be found in the BLFS book at
     <ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"/>.</para>
Index: BOOK/final-system/common/mktemp.xml
===================================================================
--- BOOK/final-system/common/mktemp.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/common/mktemp.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -61,7 +61,9 @@
 <screen os="g"><userinput>make</userinput></screen>
 
-    <para os="h">Install the package:</para>
+    <para os="h">This package does not come with a test suite.</para>
 
-<screen os="i"><userinput>make install
+    <para os="i">Install the package:</para>
+
+<screen os="j"><userinput>make install
 make install-tempfile</userinput></screen>
 
Index: BOOK/final-system/common/procps.xml
===================================================================
--- BOOK/final-system/common/procps.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/common/procps.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -38,7 +38,9 @@
 <screen os="b"><userinput>make</userinput></screen>
 
-    <para os="c">Install the package:</para>
-
-<screen os="d"><userinput>make install</userinput></screen>
+    <para os="c">This package does not come with a test suite.</para>
+
+    <para os="d">Install the package:</para>
+
+<screen os="e"><userinput>make install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/psmisc.xml
===================================================================
--- BOOK/final-system/common/psmisc.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/common/psmisc.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -58,16 +58,18 @@
 <screen os="e"><userinput>make</userinput></screen>
 
-    <para os="f">Install the package:</para>
+    <para os="f">This package does not come with a test suite.</para>
 
-<screen os="g"><userinput>make install</userinput></screen>
+    <para os="g">Install the package:</para>
 
-    <para os="h">There is no reason for the <command>pstree</command> and
+<screen os="h"><userinput>make install</userinput></screen>
+
+    <para os="i">There is no reason for the <command>pstree</command> and
     <command>pstree.x11</command> programs to reside in <filename
     class="directory">/bin</filename>. Therefore, move them to <filename
     class="directory">/usr/bin</filename>:</para>
 
-<screen os="i"><userinput>mv -v /bin/pstree* /usr/bin</userinput></screen>
+<screen os="j"><userinput>mv -v /bin/pstree* /usr/bin</userinput></screen>
 
-    <para os="j">By default, Psmisc's <command>pidof</command> program is not installed.
+    <para os="k">By default, Psmisc's <command>pidof</command> program is not installed.
     This usually is not a problem because it is installed later in the Sysvinit
     package, which provides a better <command>pidof</command> program. If
@@ -75,5 +77,5 @@
     of Psmisc by creating the following symlink:</para>
 
-<screen os="k"><userinput>ln -sv killall /bin/pidof</userinput></screen>
+<screen os="l"><userinput>ln -sv killall /bin/pidof</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/shadow.xml
===================================================================
--- BOOK/final-system/common/shadow.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/common/shadow.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -83,23 +83,25 @@
 <screen os="i"><userinput>make</userinput></screen>
 
-    <para os="j">Install the package:</para>
-
-<screen os="k"><userinput>make install</userinput></screen>
-
-    <para id="shadow-limits-login_access" os="l">Shadow uses two files to configure
+    <para os="j">This package does not come with a test suite.</para>
+
+    <para os="k">Install the package:</para>
+
+<screen os="l"><userinput>make install</userinput></screen>
+
+    <para id="shadow-limits-login_access" os="m">Shadow uses two files to configure
     authentication settings for the system. Install these two configuration
     files:</para>
 
-    <indexterm zone="shadow-limits-login_access" os="m">
+    <indexterm zone="shadow-limits-login_access" os="n">
       <primary sortas="e-/etc/limits">/etc/limits</primary>
     </indexterm>
 
-    <indexterm zone="shadow-limits-login_access" os="n">
+    <indexterm zone="shadow-limits-login_access" os="o">
       <primary sortas="e-/etc/login.access">/etc/login.access</primary>
     </indexterm>
 
-<screen os="o"><userinput>cp -v etc/{limits,login.access} /etc</userinput></screen>
-
-    <para id="shadow-login_defs" os="p">Instead of using the default
+<screen os="p"><userinput>cp -v etc/{limits,login.access} /etc</userinput></screen>
+
+    <para id="shadow-login_defs" os="q">Instead of using the default
     <emphasis>crypt</emphasis> method, use the more secure
     <emphasis>MD5</emphasis> method of password encryption, which also allows
@@ -111,9 +113,9 @@
     while copying it to its destination:</para>
 
-    <indexterm zone="shadow-login_defs" os="q">
+    <indexterm zone="shadow-login_defs" os="r">
       <primary sortas="e-/etc/login.defs">/etc/login.defs</primary>
     </indexterm>
 
-    <note os="r">
+    <note os="s">
       <para>If you built Shadow with Cracklib support, insert the following into
       the <command>sed</command> given below:</para>
@@ -122,24 +124,24 @@
     </note>
 
-<screen os="s"><userinput>sed -e's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
+<screen os="t"><userinput>sed -e's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
     -e 's@/var/spool/mail@/var/mail@' \
     etc/login.defs &gt; /etc/login.defs</userinput></screen>
 
-    <para os="t">Move a misplaced program to its proper location:</para>
-
-<screen os="u"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
-
-    <para os="v">Move Shadow's dynamic libraries to a more appropriate
+    <para os="u">Move a misplaced program to its proper location:</para>
+
+<screen os="v"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
+
+    <para os="w">Move Shadow's dynamic libraries to a more appropriate
     location:</para>
 
-<screen os="w"><userinput>mv -v /lib/libshadow.*a /usr/lib
+<screen os="x"><userinput>mv -v /lib/libshadow.*a /usr/lib
 rm -v /lib/libshadow.so
 ln -svf ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen>
 
-    <para os="x">The <option>-D</option> option of the <command>useradd</command>
+    <para os="y">The <option>-D</option> option of the <command>useradd</command>
     program requires the <filename class="directory">/etc/default</filename>
     directory for it to work properly:</para>
 
-<screen os="y"><userinput>install -dv /etc/default</userinput></screen>
+<screen os="z"><userinput>install -dv /etc/default</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/sysklogd.xml
===================================================================
--- BOOK/final-system/common/sysklogd.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/common/sysklogd.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -43,7 +43,9 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">Install the package:</para>
+    <para os="e">This package does not come with a test suite.</para>
 
-<screen os="f"><userinput>make install</userinput></screen>
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/mips/mktemp.xml
===================================================================
--- BOOK/final-system/mips/mktemp.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/mips/mktemp.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -63,4 +63,8 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/mktemp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 
Index: BOOK/final-system/mips64/mktemp.xml
===================================================================
--- BOOK/final-system/mips64/mktemp.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/mips64/mktemp.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -66,4 +66,8 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/mktemp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/gzip.xml
===================================================================
--- BOOK/final-system/multilib/gzip.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/gzip.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -68,4 +68,8 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/inetutils.xml
===================================================================
--- BOOK/final-system/multilib/inetutils.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/inetutils.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -75,4 +75,8 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/iproute2.xml
===================================================================
--- BOOK/final-system/multilib/iproute2.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/iproute2.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -56,4 +56,8 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iproute2.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/kbd.xml
===================================================================
--- BOOK/final-system/multilib/kbd.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/kbd.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -50,4 +50,8 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/man.xml
===================================================================
--- BOOK/final-system/multilib/man.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/man.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -100,4 +100,8 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/man.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/mktemp.xml
===================================================================
--- BOOK/final-system/multilib/mktemp.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/mktemp.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -56,4 +56,8 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/mktemp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/procps-64bit.xml
===================================================================
--- BOOK/final-system/multilib/procps-64bit.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/procps-64bit.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -32,5 +32,9 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make install lib64=lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+<screen os="e"><userinput>make install lib64=lib64</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/procps-n32.xml
===================================================================
--- BOOK/final-system/multilib/procps-n32.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/procps-n32.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -31,7 +31,11 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/procps.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make install lib64=lib32</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+<screen os="e"><userinput>make install lib64=lib32</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/procps.xml
===================================================================
--- BOOK/final-system/multilib/procps.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/procps.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -33,5 +33,9 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make install lib64=lib</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+<screen os="e"><userinput>make install lib64=lib</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/psmisc.xml
===================================================================
--- BOOK/final-system/multilib/psmisc.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/psmisc.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -65,4 +65,8 @@
     xpointer="xpointer(//*[@os='k'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/psmisc.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/shadow-64bit.xml
===================================================================
--- BOOK/final-system/multilib/shadow-64bit.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/shadow-64bit.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -77,5 +77,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
@@ -109,5 +109,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
+    href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 
@@ -120,5 +120,9 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen os="u"><userinput>mv -v /lib64/libshadow.*a /usr/lib64
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="shadow.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+
+<screen os="x"><userinput>mv -v /lib64/libshadow.*a /usr/lib64
 rm -v /lib64/libshadow.so
 ln -svf ../../lib64/libshadow.so.0 /usr/lib64/libshadow.so</userinput></screen>
@@ -126,9 +130,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
+    xpointer="xpointer(//*[@os='y'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
+    xpointer="xpointer(//*[@os='z'])"/>
 
   </sect2>
Index: BOOK/final-system/multilib/shadow-n32.xml
===================================================================
--- BOOK/final-system/multilib/shadow-n32.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/shadow-n32.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -79,5 +79,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="shadow.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -89,5 +89,9 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen os="w"><userinput>mv -v /lib32/libshadow.*a /usr/lib32
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="shadow.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+
+<screen os="x"><userinput>mv -v /lib32/libshadow.*a /usr/lib32
 rm -v /lib32/libshadow.so
 ln -svf ../../lib32/libshadow.so.0 /usr/lib32/libshadow.so</userinput></screen>
Index: BOOK/final-system/multilib/shadow.xml
===================================================================
--- BOOK/final-system/multilib/shadow.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/shadow.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -68,5 +68,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -82,4 +82,8 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/sysklogd.xml
===================================================================
--- BOOK/final-system/multilib/sysklogd.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/multilib/sysklogd.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -44,4 +44,8 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysklogd.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
   </sect2>
 
Index: BOOK/final-system/sparc/kbd.xml
===================================================================
--- BOOK/final-system/sparc/kbd.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/sparc/kbd.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -59,4 +59,8 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
   </sect2>
 
Index: BOOK/final-system/sparc64/kbd.xml
===================================================================
--- BOOK/final-system/sparc64/kbd.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/final-system/sparc64/kbd.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -62,4 +62,8 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
   </sect2>
 
Index: BOOK/temp-system/common/gzip.xml
===================================================================
--- BOOK/temp-system/common/gzip.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/temp-system/common/gzip.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -46,9 +46,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
Index: BOOK/temp-system/multilib/gzip.xml
===================================================================
--- BOOK/temp-system/multilib/gzip.xml	(revision 5c8aba605c5aeb2dd178fbc2031dffa506e11072)
+++ BOOK/temp-system/multilib/gzip.xml	(revision d1631d1474b43e10f6bce5e83af7f75796198daf)
@@ -48,9 +48,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
