Index: BOOK/cross-tools/x86_64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/x86_64/gcc-static.xml	(revision 768651c2574b7e7c07077edb560a27a20e869095)
+++ BOOK/cross-tools/x86_64/gcc-static.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
@@ -80,5 +80,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
+<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
     --host=${LFS_HOST} --target=${LFS_TARGET} \
     --with-local-prefix=/tools --disable-nls --disable-shared \
@@ -87,5 +87,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
+    xpointer="xpointer(//*[@os='am'])"/>
 
     <para>Continue with compiling the package:</para>
Index: BOOK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- BOOK/final-system/multilib/bzip2-64bit.xml	(revision 768651c2574b7e7c07077edb560a27a20e869095)
+++ BOOK/final-system/multilib/bzip2-64bit.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
@@ -56,5 +56,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
+<screen os="e"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
 
     <para os="m3">Now we remove the 32 bit versions of the programs so we
@@ -62,12 +62,4 @@
 
 <screen os="m4"><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/e2fsprogs-64bit.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs-64bit.xml	(revision 768651c2574b7e7c07077edb560a27a20e869095)
+++ BOOK/final-system/multilib/e2fsprogs-64bit.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
@@ -43,8 +43,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='e'])"/>
Index: BOOK/final-system/multilib/readline-64bit.xml
===================================================================
--- BOOK/final-system/multilib/readline-64bit.xml	(revision 768651c2574b7e7c07077edb560a27a20e869095)
+++ BOOK/final-system/multilib/readline-64bit.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
@@ -43,4 +43,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
Index: BOOK/final-system/multilib/sed.xml
===================================================================
--- BOOK/final-system/multilib/sed.xml	(revision 768651c2574b7e7c07077edb560a27a20e869095)
+++ BOOK/final-system/multilib/sed.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
@@ -39,8 +39,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
Index: BOOK/temp-system/multilib/zlib.xml
===================================================================
--- BOOK/temp-system/multilib/zlib.xml	(revision 768651c2574b7e7c07077edb560a27a20e869095)
+++ BOOK/temp-system/multilib/zlib.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
@@ -31,7 +31,6 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+<screen os="c"><userinput>CC="${CC} ${BUILD32}" \
+   ./configure --prefix=/tools --shared</userinput></screen>
 
     <variablelist os="aa">
Index: BOOK/temp-tools/multilib/expect-64bit.xml
===================================================================
--- BOOK/temp-tools/multilib/expect-64bit.xml	(revision 768651c2574b7e7c07077edb560a27a20e869095)
+++ BOOK/temp-tools/multilib/expect-64bit.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
@@ -34,11 +34,7 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
+<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
    --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
    --libdir=/tools/lib64 --with-x=no</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
