Index: BOOK/final-system/common/automake.xml
===================================================================
--- BOOK/final-system/common/automake.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/automake.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -28,5 +28,5 @@
     <para os="a">Prepare Automake for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/dbus.xml
===================================================================
--- BOOK/final-system/common/dbus.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/dbus.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -30,5 +30,6 @@
 <screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/dbus-1.0 --localstatedir=/var \
-    --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+    --with-systemdsystemunitdir=/lib/systemd/system \
+    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -70,5 +71,5 @@
         <seg>libdbus-1.[a,so]</seg>
         <seg>/etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0,
-        /var/lib/dbus</seg>
+        /usr/share/doc/dbus-&dbus-version;, /var/lib/dbus</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/flex.xml
===================================================================
--- BOOK/final-system/common/flex.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/flex.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -28,5 +28,5 @@
     <para os="a">Prepare Flex for compilation:</para>
 
-<screen os="b"><userinput>M4=m4 ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>M4=m4 ./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -66,8 +66,10 @@
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>flex, flex++, and lex</seg>
         <seg>libfl.[a,so] and libfl_pic.[a,so]</seg>
+        <seg>/usr/share/doc/flex-&flex-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/gawk.xml
===================================================================
--- BOOK/final-system/common/gawk.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/gawk.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -42,4 +42,9 @@
 <screen os="g"><userinput>make install</userinput></screen>
 
+    <para os="h">Install the documentation:</para>
+
+<screen os="i"><userinput>mkdir -v /usr/share/doc/gawk-&gawk-version;
+cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen>
+
   </sect2>
 
@@ -54,5 +59,6 @@
         <seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk,
         pgawk, pgawk-&gawk-version;, and pwcat</seg>
-        <seg>/usr/lib/awk, /usr/lib/gawk, /usr/share/awk</seg>
+        <seg>/usr/lib/awk, /usr/lib/gawk, /usr/share/awk,
+        /usr/share/doc/gawk-&gawk-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/gettext.xml
===================================================================
--- BOOK/final-system/common/gettext.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/gettext.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -30,5 +30,5 @@
     <para os="a">Prepare Gettext for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -61,5 +61,6 @@
         <seg>libasprintf.[a,so], libgettextlib.so, libgettextpo.[a,so],
         libgettextsrc.so, and preloadable_libintl.so</seg>
-        <seg>/usr/lib/gettext, /usr/share/doc/gettext, /usr/share/gettext</seg>
+        <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
+        /usr/share/gettext</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/gmp.xml
===================================================================
--- BOOK/final-system/common/gmp.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/gmp.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -70,4 +70,10 @@
 <screen os="i"><userinput>make install</userinput></screen>
 
+    <para os="j">Install the documentation:</para>
+
+<screen os="k"><userinput>mkdir -v /usr/share/doc/gmp-&gmp-version;
+cp -v doc/{isa_abi_headache,configuration} doc/*.html \
+    /usr/share/doc/gmp-&gmp-version;</userinput></screen>
+
   </sect2>
 
@@ -77,7 +83,9 @@
     <segmentedlist>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>libgmp.[a,so], libgmpxx.[a,so]</seg>
+        <seg>/usr/share/doc/gmp-&gmp-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/iproute2.xml
===================================================================
--- BOOK/final-system/common/iproute2.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/iproute2.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -44,5 +44,6 @@
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
+<screen os="b"><userinput>make DESTDIR= \
+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
     MANDIR=/usr/share/man</userinput></screen>
 
@@ -92,5 +93,6 @@
         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         and tc</seg>
-        <seg>/etc/iproute2, /usr/lib/tc, /usr/share/doc/iproute2</seg>
+        <seg>/etc/iproute2, /usr/lib/tc,
+        /usr/share/doc/iproute2-&iproute2-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/kbd.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -46,4 +46,9 @@
 
 <screen os="i"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
+
+    <para os="j">Install the documentation:</para>
+
+<screen os="k"><userinput>mkdir -v /usr/share/doc/kbd-&kbd-version;
+cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
 
   </sect2>
@@ -64,4 +69,5 @@
         unicode_start, and unicode_stop</seg>
         <seg>/usr/share/consolefonts, /usr/share/consoletrans,
+        /usr/share/doc/kbd-&kbd-version;,
         /usr/share/keymaps, /usr/share/unimaps</seg>
       </seglistitem>
Index: BOOK/final-system/common/mpfr.xml
===================================================================
--- BOOK/final-system/common/mpfr.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/mpfr.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -34,5 +34,6 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr --with-gmp=/usr</userinput></screen>
+  ./configure --prefix=/usr --with-gmp=/usr
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -64,5 +65,5 @@
       <seglistitem>
         <seg>libmpfr.[a,so]</seg>
-        <seg>/usr/share/doc/mpfr</seg>
+        <seg>/usr/share/doc/mpfr-&mpfr-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/readline.xml
===================================================================
--- BOOK/final-system/common/readline.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/readline.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -43,5 +43,5 @@
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make htmldir=/usr/share/doc/readline install</userinput></screen>
+<screen os="g"><userinput>make htmldir=/usr/share/doc/readline-&readline-version; install</userinput></screen>
 
     <para os="h">Now move the static libraries to a more appropriate location:</para>
@@ -66,5 +66,5 @@
       <seglistitem>
         <seg>libhistory.[a,so], and libreadline.[a,so]</seg>
-        <seg>/usr/include/readline, /usr/share/doc/readline, /usr/share/readline</seg>
+        <seg>/usr/include/readline, /usr/share/doc/readline-&readline-version;, /usr/share/readline</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/sed.xml
===================================================================
--- BOOK/final-system/common/sed.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/sed.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -27,5 +27,6 @@
     <para os="a">Prepare Sed for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
+    --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -60,5 +61,5 @@
       <seglistitem>
         <seg>sed</seg>
-        <seg>/usr/share/doc/sed</seg>
+        <seg>/usr/share/doc/sed-&sed-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/tar.xml
===================================================================
--- BOOK/final-system/common/tar.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/tar.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -51,4 +51,8 @@
 <screen os="i"><userinput>perl tarman > /usr/share/man/man1/tar.1</userinput></screen>
 
+    <para os="j">Install the documentation:</para>
+
+<screen os="k"><userinput>make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
+
   </sect2>
 
@@ -58,7 +62,9 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>rmt and tar</seg>
+        <seg>/usr/share/doc/tar-&tar-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/util-linux.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -51,5 +51,5 @@
     <para os="a">Prepare Util-linux for compilation:</para>
 
-<screen os="b"><userinput>./configure --enable-write</userinput></screen>
+<screen os="b"><userinput>./configure --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <variablelist os="c">
@@ -104,5 +104,6 @@
         <seg>libblkid.[a,so], libmount.[a,so], and libuuid.[a,so]</seg>
         <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
-        /usr/share/bash-completion, /usr/share/doc/util-linux/getopt,
+        /usr/share/bash-completion,
+        /usr/share/doc/util-linux-&util-linux-version;/getopt,
         /var/lib/hwclock</seg>
       </seglistitem>
Index: BOOK/final-system/common/xz.xml
===================================================================
--- BOOK/final-system/common/xz.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/common/xz.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -30,5 +30,5 @@
     <para os="a">Prepare XZ Utils for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -74,5 +74,5 @@
         and xzmore</seg>
         <seg>liblzma.[a,so]</seg>
-        <seg>/usr/include/lzma, /usr/share/doc/xz</seg>
+        <seg>/usr/include/lzma, /usr/share/doc/xz-&xz-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/multilib/automake.xml
===================================================================
--- BOOK/final-system/multilib/automake.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/automake.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -26,5 +26,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/dbus-64bit.xml
===================================================================
--- BOOK/final-system/multilib/dbus-64bit.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/dbus-64bit.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -29,5 +29,6 @@
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libdir=/usr/lib64 --libexecdir=/usr/lib64/dbus-1.0 \
-    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system
+    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/dbus-n32.xml
===================================================================
--- BOOK/final-system/multilib/dbus-n32.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/dbus-n32.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -29,5 +29,6 @@
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libdir=/usr/lib32 --libexecdir=/usr/lib32/dbus-1.0 \
-    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system \
+    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/dbus.xml
===================================================================
--- BOOK/final-system/multilib/dbus.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/dbus.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -29,5 +29,6 @@
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libdir=/usr/lib --libexecdir=/usr/lib/dbus-1.0 \
-    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system \
+    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/flex-64bit.xml
===================================================================
--- BOOK/final-system/multilib/flex-64bit.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/flex-64bit.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -27,5 +27,5 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" M4=m4 ./configure --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
+    --libdir=/usr/lib64 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/flex-n32.xml
===================================================================
--- BOOK/final-system/multilib/flex-n32.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/flex-n32.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -27,5 +27,5 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" M4=m4 ./configure --prefix=/usr \
-   --libdir=/usr/lib32</userinput></screen>
+   --libdir=/usr/lib32 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/flex.xml
===================================================================
--- BOOK/final-system/multilib/flex.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/flex.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -27,5 +27,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" M4=m4 ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" M4=m4 ./configure --prefix=/usr \
+    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gawk.xml
===================================================================
--- BOOK/final-system/multilib/gawk.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/gawk.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -53,4 +53,12 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/gettext-64bit.xml
===================================================================
--- BOOK/final-system/multilib/gettext-64bit.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/gettext-64bit.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -27,5 +27,6 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-   ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+   ./configure --prefix=/usr --libdir=/usr/lib64 \
+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gettext-n32.xml
===================================================================
--- BOOK/final-system/multilib/gettext-n32.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/gettext-n32.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -28,5 +28,6 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-   ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+   ./configure --prefix=/usr --libdir=/usr/lib32 \
+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gettext.xml
===================================================================
--- BOOK/final-system/multilib/gettext.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/gettext.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -28,5 +28,6 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-   ./configure --prefix=/usr</userinput></screen>
+   ./configure --prefix=/usr \
+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gmp-64bit.xml
===================================================================
--- BOOK/final-system/multilib/gmp-64bit.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/gmp-64bit.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -74,4 +74,12 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
     <para os="j">Create the 64bit header file:</para>
 
Index: BOOK/final-system/multilib/iproute2.xml
===================================================================
--- BOOK/final-system/multilib/iproute2.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/iproute2.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -46,6 +46,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= LIBDIR=/usr/lib64 \
-    DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= \
+    LIBDIR=/usr/lib64 \
+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
+    MANDIR=/usr/share/man</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/kbd.xml
===================================================================
--- BOOK/final-system/multilib/kbd.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/kbd.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -55,4 +55,12 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/mpfr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/mpfr-64bit.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/mpfr-64bit.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -36,5 +36,6 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+  ./configure --prefix=/usr --libdir=/usr/lib64
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/mpfr-n32.xml
===================================================================
--- BOOK/final-system/multilib/mpfr-n32.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/mpfr-n32.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -37,5 +37,6 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-  ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+  ./configure --prefix=/usr --libdir=/usr/lib32
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/mpfr.xml
===================================================================
--- BOOK/final-system/multilib/mpfr.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/mpfr.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -37,5 +37,6 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-  ./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
+  ./configure --prefix=/usr --host=${CLFS_TARGET32}
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/sed.xml
===================================================================
--- BOOK/final-system/multilib/sed.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/sed.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -27,5 +27,5 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --bindir=/bin</userinput></screen>
+   --bindir=/bin --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/tar.xml
===================================================================
--- BOOK/final-system/multilib/tar.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/tar.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -70,4 +70,12 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/util-linux-64bit.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-64bit.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/util-linux-64bit.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -35,5 +35,5 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
-    --enable-write</userinput></screen>
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/util-linux-n32.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-n32.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/util-linux-n32.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -28,5 +28,5 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
-    --enable-write</userinput></screen>
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/util-linux.xml
===================================================================
--- BOOK/final-system/multilib/util-linux.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/util-linux.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -28,5 +28,5 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
-    --enable-write</userinput></screen>
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/xz-64bit.xml
===================================================================
--- BOOK/final-system/multilib/xz-64bit.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/xz-64bit.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -26,5 +26,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --libdir=/usr/lib64 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/xz-n32.xml
===================================================================
--- BOOK/final-system/multilib/xz-n32.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/xz-n32.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -27,5 +27,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+    --libdir=/usr/lib32 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/xz.xml
===================================================================
--- BOOK/final-system/multilib/xz.xml	(revision ce32b58d4d3f85ee76f2efbda2961c908bf8e091)
+++ BOOK/final-system/multilib/xz.xml	(revision c87316537627f05b797be0e0ac3f62f3447049ef)
@@ -27,5 +27,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+    --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
