Index: BOOK/boot/64/createfiles.xml
===================================================================
--- BOOK/boot/64/createfiles.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/64/createfiles.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,21 +13,16 @@
   <title>Creating Essential Symlinks</title>
 
-  <para os="a">Some programs use hard-wired paths to programs which do not exist
-  yet. In order to satisfy these programs, create a number of symbolic
-  links which will be replaced by real files throughout the course of
-  the next chapter after the software has been installed.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
-ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
-ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la > ${CLFS}/usr/lib/libstdc++.la
-ln -sv bash ${CLFS}/bin/sh
-ln -sv ../run ${CLFS}/var/run</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-  <para os="b">To enable some c++ tests in the Glibc and Binutils testsuites
+  <para os="e">To enable some C++ tests in the Glibc and Binutils testsuites
   to link, create a directory and make some symbolic links:</para>
 
-<screen><userinput>mkdir -pv ${CLFS}/usr/lib64
+<screen os="f"><userinput>mkdir -pv ${CLFS}/usr/lib64
 ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib64</userinput></screen>
 
Index: BOOK/boot/64/e2fsprogs.xml
===================================================================
--- BOOK/boot/64/e2fsprogs.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/64/e2fsprogs.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -69,13 +69,4 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-
   </sect2>
 
Index: BOOK/boot/64/eudev.xml
===================================================================
--- BOOK/boot/64/eudev.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/64/eudev.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -30,5 +30,5 @@
     CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
     --host=${CLFS_TARGET}  --disable-introspection --disable-gtk-doc-html \
-    --disable-gudev --disable-keymap --with-firmware-path=/lib/firmware \
+    --disable-gudev --disable-keymap --with-firmware-path=/tools/lib/firmware \
     --enable-libkmod</userinput></screen>
 
Index: BOOK/boot/64/grub-build.xml
===================================================================
--- BOOK/boot/64/grub-build.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/64/grub-build.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -41,5 +41,5 @@
 <screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-werror --enable-grub-mkfont=no</userinput></screen>
+    --disable-werror --enable-grub-mkfont=no --with-bootdir=tools/boot</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/alpha-chapter.xml
===================================================================
--- BOOK/boot/alpha-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/alpha-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,20 +13,20 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
 
Index: BOOK/boot/alpha/kernel.xml
===================================================================
--- BOOK/boot/alpha/kernel.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/alpha/kernel.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -80,5 +80,5 @@
 
 <screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -87,5 +87,5 @@
 
 <screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -97,5 +97,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/common/changingowner.xml
===================================================================
--- BOOK/boot/common/changingowner.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/common/changingowner.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -11,13 +11,29 @@
   <title>Changing Ownership</title>
 
-  <para os="a">Currently, the <filename class="directory">${CLFS}</filename>
-  directory and all of its subdirectories  are owned by the user
-  <systemitem class="username">clfs</systemitem>, a user that exists only
-  on the host system. For security reasons, the ${CLFS} root directory and
-  all of its subdirectories should be owned by
-  <systemitem class="username">root</systemitem>. Change the ownership
-  for ${CLFS} and its subdirectories by running this command:</para>
+  <para os="a">Currently, the <filename class="directory">/tools</filename>
+  and <filename class="directory">/cross-tools</filename> directories
+  are owned by the user <emphasis>clfs</emphasis>, a user that
+  exists only on the host system. Although <filename
+  class="directory">/tools</filename> and <filename
+  class="directory">/cross-tools</filename> can be deleted once the CLFS
+  system has been finished, they can be retained to build
+  additional CLFS systems. If the <filename class="directory">/tools</filename>
+  and <filename class="directory">/cross-tools</filename> directories are
+  kept as is, the files are owned by a user ID without a corresponding
+  account. This is dangerous because a user account created later could
+  get this same user ID and would own these directories and all the files
+  therein, thus exposing those files to possible malicious manipulation.</para>
 
-<screen os="b"><userinput>chown -Rv &uid-root;:&gid-root; ${CLFS}</userinput></screen>
+  <para os="b">One possible fix for this issue might be to add the
+  <systemitem class="username">clfs</systemitem> user to the new CLFS system
+  later when creating the <filename>/etc/passwd</filename> file, taking care
+  to assign it the same user and group IDs as on the host system. Alternatively,
+  assign the contents of the <filename class="directory">/tools</filename>
+  and <filename class="directory">/cross-tools</filename> directories to
+  user <systemitem class="username">root</systemitem> by running the
+  following commands:</para>
+
+<screen os="c"><userinput>chown -Rv 0:0 ${CLFS}/tools
+chown -Rv 0:0 ${CLFS}/cross-tools</userinput></screen>
 
 </sect1>
Index: BOOK/boot/common/createfiles.xml
===================================================================
--- BOOK/boot/common/createfiles.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/common/createfiles.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -16,11 +16,15 @@
   the next chapter after the software has been installed.</para>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
+<screen os="b"><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
 ln -sv /tools/bin/file ${CLFS}/usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
 ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la > ${CLFS}/usr/lib/libstdc++.la
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; ${CLFS}/usr/lib/libstdc++.la
 ln -sv bash ${CLFS}/bin/sh
-ln -sv /run ${CLFS}/var/run</userinput></screen>
+ln -sv ../run ${CLFS}/var/run
+ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin
+ln -sv /tools/sbin/init ${CLFS}/sbin
+ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
+
 
   <para os="c">Historically, Linux maintains a list of the mounted file systems
Index: BOOK/boot/common/creatingdirs.xml
===================================================================
--- BOOK/boot/common/creatingdirs.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/common/creatingdirs.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -11,8 +11,16 @@
   <title>Creating Directories</title>
 
-  <para os="a">It is time to create some structure in the CLFS file system. Create a
+    <note os="a">
+      <para>The commands in the remainder of the book should be run as
+      the <systemitem class="username">root</systemitem> user. Check
+      that ${CLFS} is set in the
+      <systemitem class="username">root</systemitem> user&rsquo;s environment
+       before proceeding.</para>
+    </note>
+
+  <para os="b">It is time to create some structure in the CLFS file system. Create a
   standard directory tree by issuing the following commands:</para>
 
-<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib,mnt}
+<screen os="c"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib/firmware,mnt}
 mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
 mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
@@ -25,5 +33,5 @@
 mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}</userinput></screen>
 
-  <para os="c">Directories are, by default, created with permission mode 755,
+  <para os="d">Directories are, by default, created with permission mode 755,
   but this is not desirable for all directories. In the commands above,
   two changes are made&mdash;one to the home directory of user
@@ -31,5 +39,5 @@
   directories for temporary files.</para>
 
-  <para os="d">The first mode change ensures that not just anybody can enter
+  <para os="e">The first mode change ensures that not just anybody can enter
   the <filename class="directory">/root</filename> directory&mdash;the
   same as a normal user would do with his or her home directory. The
@@ -41,5 +49,5 @@
   1777 bit mask.</para>
 
-  <sect2 os="e">
+  <sect2 os="f">
     <title>FHS Compliance Note</title>
 
Index: BOOK/boot/common/devices.xml
===================================================================
--- BOOK/boot/common/devices.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/common/devices.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -18,12 +18,4 @@
     <title>Creating Initial Device Nodes</title>
 
-    <note os="a">
-      <para>The commands in the remainder of the book should be run as
-      the <systemitem class="username">root</systemitem> user. Check 
-      that ${CLFS} is set in the 
-      <systemitem class="username">root</systemitem> user&rsquo;s environment
-       before proceeding.</para>
-    </note>
-
     <para os="b">When the kernel boots the system, it requires the presence
     of a few device nodes, in particular the <filename
Index: BOOK/boot/common/e2fsprogs.xml
===================================================================
--- BOOK/boot/common/e2fsprogs.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/common/e2fsprogs.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -77,9 +77,4 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
-    <para os="ad">Create needed symlinks for a bootable system:</para>
-
-<screen os="ae"><userinput>ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin</userinput></screen>
-
-
   </sect2>
 
Index: BOOK/boot/common/eudev.xml
===================================================================
--- BOOK/boot/common/eudev.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/common/eudev.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -46,5 +46,5 @@
     loaded by <command>udev</command>:</para>
 
-<screen os="k"><userinput>install -dv ${CLFS}/lib/firmware</userinput></screen>
+<screen os="k"><userinput>install -dv /tools/lib/firmware</userinput></screen>
 
     <para os="r1">Create a dummy rule so that Eudev will name ethernet devices properly for the system.</para>
@@ -68,5 +68,5 @@
         v4l_id, write_cd_rules, write_net_rules</seg>
         <seg>libudev</seg>
-        <seg>/etc/udev, /lib/firmware, /lib/udev, /usr/share/doc/udev</seg>
+        <seg>/tools/etc/udev, /tools/lib/firmware, /tools/lib/udev</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/boot/common/introduction.xml
===================================================================
--- BOOK/boot/common/introduction.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/common/introduction.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -15,16 +15,3 @@
   build the final system packages.</para>
 
-  <para>There are a few additional packages that will need to be
-  installed to allow you to boot the minimal system. They will be installed
-  into <filename class="directory">/tools</filename>, but a few additional
-  files and symlinks will be needed on the CLFS partition to be able to boot
-  and log in. This will require the
-  <systemitem class="username">clfs</systemitem> user to have write access to
-  the rest of the CLFS partition, so you will need to temporarily change the
-  ownership of ${CLFS} to the <systemitem class="username">clfs</systemitem> user.
-  Run the following command as <systemitem
-  class="username">root</systemitem>:</para>
-
-<screen><userinput>chown -v clfs ${CLFS}</userinput></screen>
-
 </sect1>
Index: BOOK/boot/common/kmod.xml
===================================================================
--- BOOK/boot/common/kmod.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/common/kmod.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -22,4 +22,10 @@
   <sect2 role="installation">
     <title>Installation of Kmod</title>
+
+    <para os="s1">Tell Kmod to use <filename class="directory">/tools/lib/modules</filename>:</para>
+
+<screen os="s2"><userinput>cp -v libkmod/libkmod.c{,.orig}
+sed '/dirname_default_prefix /s@/lib/modules@/tools&amp;@' \
+    libkmod/libkmod.c.orig &gt; libkmod/libkmod.c</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -63,11 +69,8 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>ln -sv /tools/bin/kmod ${CLFS}/bin
-ln -sv kmod ${CLFS}/bin/lsmod
-ln -sv ../bin/kmod ${CLFS}/sbin/depmod
-ln -sv ../bin/kmod ${CLFS}/sbin/insmod
-ln -sv ../bin/kmod ${CLFS}/sbin/modprobe
-ln -sv ../bin/kmod ${CLFS}/sbin/modinfo
-ln -sv ../bin/kmod ${CLFS}/sbin/rmmod</userinput></screen>
+<screen os="j"><userinput>ln -sfv kmod /tools/bin/lsmod
+for tool in depmod insmod modprobe modinfo rmmod; do
+    ln -sv ../bin/kmod /tools/sbin/${tool}
+done</userinput></screen>
 
   </sect2>
Index: BOOK/boot/common/shadow.xml
===================================================================
--- BOOK/boot/common/shadow.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/common/shadow.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -42,15 +42,16 @@
 sed '/PASSWD_PROGRAM/s@/bin/passwd@/tools&amp;@' config.h.orig &gt; config.h</userinput></screen>
 
-    <para os="h">Compile the package:</para>
+    <para os="h">Prevent Shadow from setting installed programs suid:</para>
 
-<screen os="i"><userinput>make</userinput></screen>
+<screen os="i"><userinput>cp -v src/Makefile{,.orig}
+sed 's/\(^suidu*bins = \).*/\1/' src/Makefile.orig &gt; src/Makefile</userinput></screen>
 
-    <para os="j">Install the package:</para>
+    <para os="j">Compile the package:</para>
 
-<screen os="k"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make</userinput></screen>
 
-    <para os="l">Create needed symlinks to be able to log on:</para>
+    <para os="l">Install the package:</para>
 
-<screen os="m"><userinput>ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
+<screen os="m"><userinput>make install</userinput></screen>
 
   </sect2>
Index: BOOK/boot/common/sysvinit.xml
===================================================================
--- BOOK/boot/common/sysvinit.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/common/sysvinit.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -39,6 +39,5 @@
    <para os="e">Install the package:</para>
 
-<screen os="ad"><userinput>make -C src ROOT=/tools install
-ln -svf /tools/sbin/init ${CLFS}/sbin</userinput></screen>
+<screen os="ad"><userinput>make -C src ROOT=/tools install</userinput></screen>
 
   </sect2>
Index: BOOK/boot/mips-chapter.xml
===================================================================
--- BOOK/boot/mips-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/mips-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,19 +13,19 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
Index: BOOK/boot/mips/kernel.xml
===================================================================
--- BOOK/boot/mips/kernel.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/mips/kernel.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -72,5 +72,5 @@
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -79,5 +79,5 @@
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -89,6 +89,6 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
-gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/vmlinux-&linux-version;
+gzip -9 /tools/boot/vmlinux-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/mips64-64-chapter.xml
===================================================================
--- BOOK/boot/mips64-64-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/mips64-64-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,20 +13,20 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
Index: BOOK/boot/mips64-chapter.xml
===================================================================
--- BOOK/boot/mips64-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/mips64-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,20 +13,20 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
Index: BOOK/boot/mips64/createfiles.xml
===================================================================
--- BOOK/boot/mips64/createfiles.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/mips64/createfiles.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -23,7 +23,10 @@
 ln -sv /tools/lib32/libstdc++.so{.6,} ${CLFS}/usr/lib32
 ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la > ${CLFS}/usr/lib/libstdc++.la
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; ${CLFS}/usr/lib/libstdc++.la
 ln -sv bash ${CLFS}/bin/sh
-ln -sv ../run ${CLFS}/var/run</userinput></screen>
+ln -sv ../run ${CLFS}/var/run
+ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin
+ln -sv /tools/sbin/init ${CLFS}/sbin
+ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/mips64/kernel.xml
===================================================================
--- BOOK/boot/mips64/kernel.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/mips64/kernel.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -76,5 +76,5 @@
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -83,5 +83,5 @@
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -93,6 +93,6 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
-gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/vmlinux-&linux-version;
+gzip -9 /tools/boot/vmlinux-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/multilib/createfiles.xml
===================================================================
--- BOOK/boot/multilib/createfiles.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/multilib/createfiles.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -21,7 +21,10 @@
 ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
 ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la > ${CLFS}/usr/lib/libstdc++.la
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; ${CLFS}/usr/lib/libstdc++.la
 ln -sv bash ${CLFS}/bin/sh
-ln -sv ../run ${CLFS}/var/run</userinput></screen>
+ln -sv ../run ${CLFS}/var/run
+ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin
+ln -sv /tools/sbin/init ${CLFS}/sbin
+ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/multilib/creatingdirs.xml
===================================================================
--- BOOK/boot/multilib/creatingdirs.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/multilib/creatingdirs.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -15,5 +15,9 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+<screen os="c"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
 mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
 mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
@@ -30,8 +34,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
@@ -40,3 +40,7 @@
   xpointer="xpointer(//*[@os='e'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
+
 </sect1>
Index: BOOK/boot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/boot/multilib/e2fsprogs.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/multilib/e2fsprogs.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -75,12 +75,4 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
   </sect2>
 
Index: BOOK/boot/multilib/kmod.xml
===================================================================
--- BOOK/boot/multilib/kmod.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/multilib/kmod.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of Kmod</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -54,5 +62,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
Index: BOOK/boot/ppc-chapter.xml
===================================================================
--- BOOK/boot/ppc-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/ppc-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,20 +13,20 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/powerpc-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
Index: BOOK/boot/ppc/kernel.xml
===================================================================
--- BOOK/boot/ppc/kernel.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/ppc/kernel.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -77,5 +77,5 @@
 
 <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -84,5 +84,5 @@
 
 <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -94,5 +94,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/ppc64-64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-64-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/ppc64-64-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,21 +13,21 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/powerpc-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/yaboot-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
Index: BOOK/boot/ppc64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/ppc64-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,22 +13,22 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs-libs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/powerpc-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot.xml"/>
Index: BOOK/boot/ppc64/e2fsprogs.xml
===================================================================
--- BOOK/boot/ppc64/e2fsprogs.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/ppc64/e2fsprogs.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -85,12 +85,4 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
   </sect2>
 
Index: BOOK/boot/ppc64/kernel.xml
===================================================================
--- BOOK/boot/ppc64/kernel.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/ppc64/kernel.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -76,5 +76,5 @@
 
 <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -83,5 +83,5 @@
 
 <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -93,5 +93,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/sparc-chapter.xml
===================================================================
--- BOOK/boot/sparc-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/sparc-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,19 +13,19 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
Index: BOOK/boot/sparc/kernel.xml
===================================================================
--- BOOK/boot/sparc/kernel.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/sparc/kernel.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -72,5 +72,5 @@
 
 <screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -79,5 +79,5 @@
 
 <screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -89,5 +89,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/sparc64-64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-64-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/sparc64-64-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,20 +13,20 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
Index: BOOK/boot/sparc64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/sparc64-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,20 +13,20 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
Index: BOOK/boot/sparc64/kernel.xml
===================================================================
--- BOOK/boot/sparc64/kernel.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/sparc64/kernel.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -73,5 +73,5 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=sparc64 INSTALL_MOD_PATH=${CLFS} \
+<screen><userinput>make ARCH=sparc64 INSTALL_MOD_PATH=/tools \
    CROSS_COMPILE=${CLFS_TARGET}- modules_install</userinput></screen>
 
@@ -81,5 +81,5 @@
 
 <screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -91,5 +91,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/x86-chapter.xml
===================================================================
--- BOOK/boot/x86-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/x86-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,18 +13,18 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
Index: BOOK/boot/x86/kernel.xml
===================================================================
--- BOOK/boot/x86/kernel.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/x86/kernel.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -80,5 +80,5 @@
 
 <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
-    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+    INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -87,15 +87,13 @@
 
 <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
 
     <para os="u">After kernel compilation is complete, additional steps are
     required to complete the installation. Some files need to be copied to
-    the <filename class="directory">${CLFS}/boot</filename> directory.</para>
+    the <filename class="directory">/tools/boot</filename> directory.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
+    <para os="v">Issue the following commands to install the kernel:</para>
 
-<screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -103,5 +101,5 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen os="w1"><userinput>cp -v System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
+<screen os="w1"><userinput>cp -v System.map /tools/boot/System.map-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -109,5 +107,5 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen os="x1"><userinput>cp -v .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
+<screen os="x1"><userinput>cp -v .config /tools/boot/config-&linux-version;</userinput></screen>
 
   </sect2>
Index: BOOK/boot/x86_64-64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-64-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/x86_64-64-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,19 +13,19 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/grub-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/grub-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
Index: BOOK/boot/x86_64-64/kmod.xml
===================================================================
--- BOOK/boot/x86_64-64/kmod.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/x86_64-64/kmod.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of Kmod</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -53,5 +61,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
Index: BOOK/boot/x86_64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-chapter.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/x86_64-chapter.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,19 +13,19 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grub-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grub-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
Index: BOOK/boot/x86_64/kernel.xml
===================================================================
--- BOOK/boot/x86_64/kernel.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/boot/x86_64/kernel.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -76,5 +76,5 @@
 
 <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -83,5 +83,5 @@
 
 <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -93,5 +93,6 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v arch/x86_64/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
+<screen><userinput>mkdir -pv /tools/boot
+cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/chroot/64/createfiles.xml
===================================================================
--- BOOK/chroot/64/createfiles.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/chroot/64/createfiles.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -27,5 +27,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/64/createfiles.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
+  xpointer="xpointer(//*[@os='e'])"/>
 
 <screen><userinput>mkdir -pv /usr/lib64
Index: BOOK/chroot/common/creatingdirs.xml
===================================================================
--- BOOK/chroot/common/creatingdirs.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/chroot/common/creatingdirs.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,7 +13,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="b"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
+<screen os="c"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
 mkdir -pv /{proc,media/{floppy,cdrom},run/shm,sbin,srv,sys}
 mkdir -pv /var/{lock,log,mail,spool}
@@ -28,8 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../boot/common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
@@ -38,3 +34,7 @@
   xpointer="xpointer(//*[@os='e'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../boot/common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
+
 </sect1>
Index: BOOK/chroot/common/kernfs.xml
===================================================================
--- BOOK/chroot/common/kernfs.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/chroot/common/kernfs.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -11,7 +11,11 @@
   <title>Mounting Virtual Kernel File Systems</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../boot/common/devices.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    <note os="a">
+      <para>The commands in the remainder of the book should be run as
+      the <systemitem class="username">root</systemitem> user. Check
+      that ${CLFS} is set in the
+      <systemitem class="username">root</systemitem> user&rsquo;s environment
+       before proceeding.</para>
+    </note>
 
   <para>Various file systems exported by the kernel are used to communicate
Index: BOOK/chroot/mips/creatingdirs.xml
===================================================================
--- BOOK/chroot/mips/creatingdirs.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/chroot/mips/creatingdirs.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,9 +13,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
 
    <para os="m1">These entries are needed for the RaQ2 bootloader. Only use these
@@ -27,8 +27,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
@@ -37,3 +33,7 @@
   xpointer="xpointer(//*[@os='e'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
+
 </sect1>
Index: BOOK/chroot/mips64/creatingdirs.xml
===================================================================
--- BOOK/chroot/mips64/creatingdirs.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/chroot/mips64/creatingdirs.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,5 +13,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,32,64},mnt}
@@ -39,8 +39,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
@@ -49,3 +45,7 @@
   xpointer="xpointer(//*[@os='e'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
+
 </sect1>
Index: BOOK/chroot/multilib/creatingdirs.xml
===================================================================
--- BOOK/chroot/multilib/creatingdirs.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/chroot/multilib/creatingdirs.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -13,5 +13,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
@@ -30,8 +30,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
@@ -40,3 +36,7 @@
   xpointer="xpointer(//*[@os='e'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
+
 </sect1>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 03679c83e618d1c719c6650b215e32f10247fc44)
+++ BOOK/introduction/common/changelog.xml	(revision d2ecc6524df2d495124d24523c8bdcfa284a0070)
@@ -38,4 +38,15 @@
 
     <listitem>
+      <para>20 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Reorganized "boot" section to allow everything
+          to be installed into /tools, remove the need to chown ${CLFS} to the
+          clfs user, and generally make the chapter's instructions flow better.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>18 April 2014</para>
       <itemizedlist>
