Index: BOOK/final-system/mips64-64/glibc.xml
===================================================================
--- BOOK/final-system/mips64-64/glibc.xml	(revision cc9f07c77f30550d6b99f1952bbf20dab743df98)
+++ BOOK/final-system/mips64-64/glibc.xml	(revision bb6f1356bb39fe6544cda5360da4f46661bd9b01)
@@ -35,4 +35,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
@@ -53,12 +61,4 @@
     href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l8'])"/>
 
     <para>Now we will force Glibc to build as 64-bit instead of the default
Index: BOOK/final-system/ppc64-64/glibc.xml
===================================================================
--- BOOK/final-system/ppc64-64/glibc.xml	(revision cc9f07c77f30550d6b99f1952bbf20dab743df98)
+++ BOOK/final-system/ppc64-64/glibc.xml	(revision bb6f1356bb39fe6544cda5360da4f46661bd9b01)
@@ -35,4 +35,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
@@ -53,12 +61,4 @@
     href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l8'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/sparc64-64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/glibc.xml	(revision cc9f07c77f30550d6b99f1952bbf20dab743df98)
+++ BOOK/final-system/sparc64-64/glibc.xml	(revision bb6f1356bb39fe6544cda5360da4f46661bd9b01)
@@ -35,4 +35,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
@@ -61,12 +69,4 @@
     href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l8'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/x86_64-64/glibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/glibc.xml	(revision cc9f07c77f30550d6b99f1952bbf20dab743df98)
+++ BOOK/final-system/x86_64-64/glibc.xml	(revision bb6f1356bb39fe6544cda5360da4f46661bd9b01)
@@ -34,4 +34,10 @@
     xpointer="xpointer(//*[@os='l2'])"/>
 
+    <para os="l3">Modify the <command>ldd</command> rewrite script to remove
+    <filename class="directory">lib64</filename> and
+    <filename class="directory">libx32</filename> from RTLDLIST.</para>
+
+<screen os="l4"><userinput>sed -i '/RTLDLIST/d' sysdeps/unix/sysv/linux/*/ldd-rewrite.sed</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
@@ -50,10 +56,4 @@
 
 <screen os="l6"><userinput>echo "libc_cv_slibdir=/lib" &gt;&gt; config.cache</userinput></screen>
-
-    <para os="l7">Modify the <command>ldd</command> rewrite script to remove
-    <filename class="directory">lib64</filename> and
-    <filename class="directory">libx32</filename> from RTLDLIST.</para>
-
-<screen os="l8"><userinput>sed -i '/RTLDLIST/d' sysdeps/unix/sysv/linux/*/ldd-rewrite.sed</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
