Index: BOOK/cross-tools/arm-chapter.xml
===================================================================
--- BOOK/cross-tools/arm-chapter.xml	(revision 8e23f7cac7019c7a4d97f6bed69e0c9f3db8120a)
+++ BOOK/cross-tools/arm-chapter.xml	(revision 1f0a9c9610bd915409e903333ec8c294221b2e95)
@@ -19,5 +19,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/glibc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-final.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
Index: BOOK/cross-tools/arm/glibc-headers.xml
===================================================================
--- BOOK/cross-tools/arm/glibc-headers.xml	(revision 8e23f7cac7019c7a4d97f6bed69e0c9f3db8120a)
+++ BOOK/cross-tools/arm/glibc-headers.xml	(revision 1f0a9c9610bd915409e903333ec8c294221b2e95)
@@ -26,8 +26,16 @@
     the glibc we are using in cross-lfs. The reason we are changing it is
     because this only installs the headers, no compiling takes place. In the
-    next glibc chapter, we use the gcc that's build right after this chapter.</para>
+    next glibc chapter, we use the gcc that's built right after this chapter.</para>
  	
 <screen os="s2"><userinput>cp configure{,.orig}
 sed -e 's/3.4/3.[0-9]/g' configure.orig > configure</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='u1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='u2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -93,5 +101,5 @@
 
    <para os="n">First we will copy a common file over to <filename 
-   class="directory">/tools/include</filename>:</para>
+   class="directory">${LFS}/usr/include</filename>:</para>
 
 <screen os="o"><userinput>install -dv ${LFS}/usr/include/bits
Index: BOOK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision 8e23f7cac7019c7a4d97f6bed69e0c9f3db8120a)
+++ BOOK/cross-tools/common/binutils.xml	(revision 1f0a9c9610bd915409e903333ec8c294221b2e95)
@@ -35,13 +35,13 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
Index: BOOK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision 8e23f7cac7019c7a4d97f6bed69e0c9f3db8120a)
+++ BOOK/cross-tools/common/glibc.xml	(revision 1f0a9c9610bd915409e903333ec8c294221b2e95)
@@ -77,8 +77,8 @@
     --cache-file=config.cache</userinput></screen>
 
-    <variablelist os="dj">
+    <variablelist os="j">
       <title>The meaning of the new configure options:</title>
 
-      <varlistentry os="dj1">
+      <varlistentry os="j1">
         <term><parameter>BUILD_CC="gcc"</parameter></term>
         <listitem>
@@ -88,5 +88,5 @@
       </varlistentry>
 
-      <varlistentry os="dj2">
+      <varlistentry os="j2">
         <term><parameter>CC="${LFS_TARGET}-gcc"</parameter></term>
         <listitem>
@@ -96,5 +96,5 @@
       </varlistentry>
 
-      <varlistentry os="dj3">
+      <varlistentry os="j3">
         <term><parameter>AR="${LFS_TARGET}-ar"</parameter></term>
         <listitem>
@@ -104,5 +104,5 @@
       </varlistentry>
 
-      <varlistentry os="dj4">
+      <varlistentry os="j4">
         <term><parameter>RANLIB="${LFS_TARGET}-ranlib"</parameter></term>
         <listitem>
@@ -112,5 +112,5 @@
       </varlistentry>
 
-      <varlistentry os="dj5">
+      <varlistentry os="j5">
         <term><parameter>--disable-profile</parameter></term>
         <listitem>
@@ -120,5 +120,5 @@
       </varlistentry>
 
-      <varlistentry os="dj6">
+      <varlistentry os="j6">
         <term><parameter>--enable-add-ons</parameter></term>
         <listitem>
@@ -128,5 +128,5 @@
       </varlistentry>
 
-      <varlistentry os="dj7">
+      <varlistentry os="j7">
         <term><parameter>--with-tls</parameter></term>
         <listitem>
@@ -135,5 +135,5 @@
       </varlistentry>
 
-      <varlistentry os="dj8">
+      <varlistentry os="j8">
         <term><parameter>--with-__thread</parameter></term>
         <listitem>
@@ -143,5 +143,5 @@
       </varlistentry>
 
-      <varlistentry os="dj9">
+      <varlistentry os="j9">
         <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
         <listitem>
@@ -151,5 +151,5 @@
       </varlistentry>
 
-      <varlistentry os="dj10">
+      <varlistentry os="j10">
         <term><parameter>--cache-file=config.cache</parameter></term>
         <listitem>
Index: BOOK/final-preps/creatingdirs.xml
===================================================================
--- BOOK/final-preps/creatingdirs.xml	(revision 8e23f7cac7019c7a4d97f6bed69e0c9f3db8120a)
+++ BOOK/final-preps/creatingdirs.xml	(revision 1f0a9c9610bd915409e903333ec8c294221b2e95)
@@ -16,6 +16,6 @@
 <screen><userinput>mkdir -pv ${LFS}/{bin,boot,etc/opt,home,lib,mnt,opt}
 mkdir -pv ${LFS}/{media/{floppy,cdrom},sbin,srv,var}
-install -dv -m 0750 /root
-install -dv -m 1777 /tmp /var/tmp
+install -dv -m 0750 ${LFS}/root
+install -dv -m 1777 ${LFS}/tmp ${LFS}/var/tmp
 mkdir -pv ${LFS}/usr/{,local/}{bin,include,lib,sbin,src}
 mkdir -pv ${LFS}/usr/{,local/}share/{doc,info,locale,man}
Index: BOOK/final-preps/creatingfiles.xml
===================================================================
--- BOOK/final-preps/creatingfiles.xml	(revision 8e23f7cac7019c7a4d97f6bed69e0c9f3db8120a)
+++ BOOK/final-preps/creatingfiles.xml	(revision 1f0a9c9610bd915409e903333ec8c294221b2e95)
@@ -27,5 +27,5 @@
   command:</para>
 
-<screen><userinput>cat &gt; %{LFS}/etc/passwd &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${LFS}/etc/passwd &lt;&lt; "EOF"
 <literal>root:x:0:0:root:/root:/bin/bash</literal>
 EOF</userinput></screen>
Index: BOOK/materials/arm/packages.xml
===================================================================
--- BOOK/materials/arm/packages.xml	(revision 8e23f7cac7019c7a4d97f6bed69e0c9f3db8120a)
+++ BOOK/materials/arm/packages.xml	(revision 1f0a9c9610bd915409e903333ec8c294221b2e95)
@@ -10,18 +10,18 @@
 
   <title>Additional Packages for ARM</title>
-<!--
+
   <variablelist role="materials">
 
-    <varlistentry os="grub">
-      <term>GRUB (&grub-version;) - <token>&grub-size;</token>:</term>
+    <varlistentry>
+      <term>Glibc-ports (&glibc-ports-version;) - <token>&glibc-ports-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&grub-home;"/></para>
-        <para>Download: <ulink url="&grub-url;"/></para>
-        <para>MD5 sum: <literal>&grub-md5;</literal></para>
+        <para>Home page: <ulink url="&glibc-ports-home;"/></para>
+        <para>Download: <ulink url="&glibc-ports-url;"/></para>
+        <para>MD5 sum: <literal>&glibc-ports-md5;</literal></para>
       </listitem>
     </varlistentry>
 
   </variablelist>
--->
+
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/packages.xml"
