diff --git a/BOOK/final-system/common/glibc.xml b/BOOK/final-system/common/glibc.xml
index 2379f12..2ce24be 100644
--- a/BOOK/final-system/common/glibc.xml
+++ b/BOOK/final-system/common/glibc.xml
@@ -27,15 +27,13 @@
   <sect2 role="installation">
     <title>Installation of Glibc</title>
 
-    <note os="z">
-      <para>Some packages outside of CLFS suggest installing GNU libiconv in
-      order to translate data from one encoding to another. The project's
-      home page (<ulink url="http://www.gnu.org/software/libiconv/"/>) says
-      <quote>This library provides an <function>iconv()</function>
-      implementation, for use on systems which don't have one, or whose
-      implementation cannot convert from/to Unicode.</quote> Glibc provides
-      an <function>iconv()</function> implementation and can convert from/to
-      Unicode, therefore libiconv is not required on a CLFS system.</para>
+    <note os="b">
+      <para>The Glibc build system is self-contained and will install
+      perfectly, even though the compiler specs file and linker are still
+      pointing at <filename class="directory">/tools</filename>. The specs
+      and linker cannot be adjusted before the Glibc install because the
+      Glibc Autoconf tests would give false results and defeat the goal
+      of achieving a clean build.</para>
     </note>
 
     <para os="l1">At the end of the installation, the build system will run
@@ -53,13 +51,6 @@ sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
   scripts/test-installation.pl
 unset LINKER</userinput></screen>
 
-    <para os="b">The Glibc build system is self-contained and will install
-    perfectly, even though the compiler specs file and linker are still
-    pointing at <filename class="directory">/tools</filename>. The specs
-    and linker cannot be adjusted before the Glibc install because the
-    Glibc Autoconf tests would give false results and defeat the goal
-    of achieving a clean build.</para>
-
     <para os="e">The Glibc documentation recommends building Glibc outside of     the source directory in a dedicated build directory:</para>
 
 <screen os="f"><userinput>mkdir -v ../glibc-build
@@ -162,15 +153,12 @@ cd ../glibc-build</userinput></screen>
 <screen os="t"><userinput>make install &amp;&amp;
 rm -v /usr/include/rpcsvc/*.x</userinput></screen>
 
-    <para os="u">Install the configuration file and runtime directory for
+    <para os="u">Install the configuration file, runtime directory, and systemd support files for
     <command>nscd</command>:</para>
 
 <screen os="v"><userinput>cp -v ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf
-mkdir -pv /var/cache/nscd</userinput></screen>
-
-    <para os="w">Install the systemd support files for <command>nscd</command>:</para>
-
-<screen os="x"><userinput>install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.tmpfiles /usr/lib/tmpfiles.d/nscd.conf
+mkdir -pv /var/cache/nscd
+install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.tmpfiles /usr/lib/tmpfiles.d/nscd.conf
 install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.service /lib/systemd/system/nscd.service</userinput></screen>
 
   </sect2>
@@ -178,9 +166,12 @@ install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.service /lib/systemd/system
   <sect2 id="i18n-glibc" role="configuration">
     <title>Internationalization</title>
 
-    <para>The locales that can make the system respond in a different
-    language were not installed by the above command. Install them
-    with:</para>
+    <indexterm zone="i18n-glibc">
+      <primary sortas="e-/etc/localtime">/etc/localtime</primary>
+    </indexterm>
+
+    <para>Use the following command to install the locales that can make the
+    system respond in a different language:</para>
 
 <screen><userinput>make localedata/install-locales</userinput></screen>
 
@@ -226,46 +217,7 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
     circumvent these restrictions are documented in internationalization-related
     hints.</para>
 
-  </sect2>
-
-  <sect2 id="conf-glibc" role="configuration">
-    <title>Configuring Glibc</title>
-
-    <indexterm zone="conf-glibc">
-      <primary sortas="e-/etc/nsswitch.conf">/etc/nsswitch.conf</primary>
-    </indexterm>
-
-    <indexterm zone="conf-glibc">
-      <primary sortas="e-/etc/localtime">/etc/localtime</primary>
-    </indexterm>
-
-    <para>The <filename>/etc/nsswitch.conf</filename> file needs to be created
-    because, although Glibc provides defaults when this file is missing or
-    corrupt, the Glibc defaults do not work well in a networked environment.
-    The time zone also needs to be configured.</para>
-
-    <para>Create a new file <filename>/etc/nsswitch.conf</filename> by running
-    the following:</para>
-
-<screen><userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"
-<literal># Begin /etc/nsswitch.conf
-
-passwd: files
-group: files
-shadow: files
-
-hosts: files dns
-networks: files
-
-protocols: files
-services: files
-ethers: files
-rpc: files
-
-# End /etc/nsswitch.conf</literal>
-EOF</userinput></screen>
-
-    <para>Install timezone data:</para>
+    <para>Next, install timezone data:</para>
 <screen><userinput>tar -xf ../tzdata&tzdata-version;.tar.gz
 
 ZONEINFO=/usr/share/zoneinfo
@@ -338,6 +290,41 @@ unset ZONEINFO</userinput></screen>
 
   </sect2>
 
+  <sect2 id="conf-glibc" role="configuration">
+    <title>Configuring Glibc</title>
+
+    <indexterm zone="conf-glibc">
+      <primary sortas="e-/etc/nsswitch.conf">/etc/nsswitch.conf</primary>
+    </indexterm>
+
+    <para>The <filename>/etc/nsswitch.conf</filename> file needs to be created
+    because, although Glibc provides defaults when this file is missing or
+    corrupt, the Glibc defaults do not work well in a networked environment.
+    The time zone also needs to be configured.</para>
+
+    <para>Create a new file <filename>/etc/nsswitch.conf</filename> by running
+    the following:</para>
+
+<screen><userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"
+<literal># Begin /etc/nsswitch.conf
+
+passwd: files
+group: files
+shadow: files
+
+hosts: files dns
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+# End /etc/nsswitch.conf</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
   <sect2 id="conf-ld" role="configuration">
     <title>Configuring The Dynamic Loader</title>
 
diff --git a/BOOK/final-system/mips64-64/glibc.xml b/BOOK/final-system/mips64-64/glibc.xml
index aa7de88..d9b1ce8 100644
--- a/BOOK/final-system/mips64-64/glibc.xml
+++ b/BOOK/final-system/mips64-64/glibc.xml
@@ -23,7 +23,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
@@ -43,10 +43,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -131,14 +127,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/mips64/glibc-64bit.xml b/BOOK/final-system/mips64/glibc-64bit.xml
index 56bd1c9..a1be1d1 100644
--- a/BOOK/final-system/mips64/glibc-64bit.xml
+++ b/BOOK/final-system/mips64/glibc-64bit.xml
@@ -22,6 +22,10 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/glibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
 
@@ -31,10 +35,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -105,14 +105,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/mips64/glibc-n32.xml b/BOOK/final-system/mips64/glibc-n32.xml
index 59b8d72..347a981 100644
--- a/BOOK/final-system/mips64/glibc-n32.xml
+++ b/BOOK/final-system/mips64/glibc-n32.xml
@@ -22,6 +22,10 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/glibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
 
@@ -32,10 +36,6 @@ unset LINKER</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/glibc-64bit.xml b/BOOK/final-system/multilib/glibc-64bit.xml
index 0b56766..64a4c18 100644
--- a/BOOK/final-system/multilib/glibc-64bit.xml
+++ b/BOOK/final-system/multilib/glibc-64bit.xml
@@ -22,6 +22,10 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
 
@@ -32,10 +36,6 @@ unset LINKER</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -118,14 +118,6 @@ unset LINKER</userinput></screen>
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/glibc.xml b/BOOK/final-system/multilib/glibc.xml
index 3ecc0ad..7eb2b2e 100644
--- a/BOOK/final-system/multilib/glibc.xml
+++ b/BOOK/final-system/multilib/glibc.xml
@@ -24,7 +24,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
@@ -36,10 +36,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc/glibc.xml b/BOOK/final-system/ppc/glibc.xml
index a9463f5..1107e8f 100644
--- a/BOOK/final-system/ppc/glibc.xml
+++ b/BOOK/final-system/ppc/glibc.xml
@@ -23,7 +23,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
@@ -35,10 +35,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -109,14 +105,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc64-64/glibc.xml b/BOOK/final-system/ppc64-64/glibc.xml
index 26db7eb..d144be0 100644
--- a/BOOK/final-system/ppc64-64/glibc.xml
+++ b/BOOK/final-system/ppc64-64/glibc.xml
@@ -23,7 +23,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
@@ -43,10 +43,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -141,14 +137,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc64/glibc-64bit.xml b/BOOK/final-system/ppc64/glibc-64bit.xml
index 9112f73..cd9f85a 100644
--- a/BOOK/final-system/ppc64/glibc-64bit.xml
+++ b/BOOK/final-system/ppc64/glibc-64bit.xml
@@ -22,6 +22,10 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
 
@@ -31,10 +35,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -107,14 +107,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc64/glibc.xml b/BOOK/final-system/ppc64/glibc.xml
index 347df4f..d95a538 100644
--- a/BOOK/final-system/ppc64/glibc.xml
+++ b/BOOK/final-system/ppc64/glibc.xml
@@ -24,7 +24,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
@@ -34,10 +34,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
     <para os="u1">The powerpc (32) architecture is expected to fail the
     check-textrel tests because it cannot protect some elf segments in
     shared libraries from being executable and writable. Using the default
diff --git a/BOOK/final-system/sparc64-64/glibc.xml b/BOOK/final-system/sparc64-64/glibc.xml
index ffddb10..1ce9a78 100644
--- a/BOOK/final-system/sparc64-64/glibc.xml
+++ b/BOOK/final-system/sparc64-64/glibc.xml
@@ -23,7 +23,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
@@ -43,10 +43,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -138,14 +134,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/sparc64/glibc-64bit.xml b/BOOK/final-system/sparc64/glibc-64bit.xml
index 728f723..4f0619c 100644
--- a/BOOK/final-system/sparc64/glibc-64bit.xml
+++ b/BOOK/final-system/sparc64/glibc-64bit.xml
@@ -23,6 +23,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -31,10 +35,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -115,14 +115,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/x86/glibc.xml b/BOOK/final-system/x86/glibc.xml
index f32d3c8..e652f26 100644
--- a/BOOK/final-system/x86/glibc.xml
+++ b/BOOK/final-system/x86/glibc.xml
@@ -23,7 +23,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
@@ -35,10 +35,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -147,14 +143,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/x86_64-64/glibc.xml b/BOOK/final-system/x86_64-64/glibc.xml
index 593ef0e..a832d69 100644
--- a/BOOK/final-system/x86_64-64/glibc.xml
+++ b/BOOK/final-system/x86_64-64/glibc.xml
@@ -23,7 +23,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
@@ -42,10 +42,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -125,14 +121,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/x86_64/glibc-64bit.xml b/BOOK/final-system/x86_64/glibc-64bit.xml
index be1db44..2ad7328 100644
--- a/BOOK/final-system/x86_64/glibc-64bit.xml
+++ b/BOOK/final-system/x86_64/glibc-64bit.xml
@@ -22,6 +22,10 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/glibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
 
@@ -31,10 +35,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -110,14 +110,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
