Index: BOOK/final-preps/addinguser.xml
===================================================================
--- BOOK/final-preps/addinguser.xml	(revision 351f3e1f13e40e6743568c7f0309109b7ef15c34)
+++ BOOK/final-preps/addinguser.xml	(revision 6b369e9dd1cff8c3a1f1c97835bafdc0673212a2)
@@ -79,10 +79,12 @@
 
   <para>Grant <systemitem class="username">lfs</systemitem> full access to
-  <filename class="directory">$LFS</filename> and <filename
-  class="directory">$LFS/tools</filename> by making <systemitem
+  <filename class="directory">$LFS</filename>,
+  <filename class="directory">$LFS/cross-tools</filename>, 
+  and <filename class="directory">$LFS/tools</filename> by making <systemitem
   class="username">lfs</systemitem> the directories owner:</para>
 
 <screen><userinput>chown lfs $LFS
-chown lfs $LFS/tools</userinput></screen>
+chown lfs $LFS/tools
+chown lfs $LFS/cross-tools</userinput></screen>
 
   <para>If a separate working directory was created as suggested, we will
Index: BOOK/final-preps/creatingcrossdir.xml
===================================================================
--- BOOK/final-preps/creatingcrossdir.xml	(revision 351f3e1f13e40e6743568c7f0309109b7ef15c34)
+++ BOOK/final-preps/creatingcrossdir.xml	(revision 6b369e9dd1cff8c3a1f1c97835bafdc0673212a2)
@@ -9,8 +9,8 @@
   <?dbhtml filename="creatingcrossdir.html"?>
 
-  <title>Creating the $HOME/cross-tools Directory</title>
+  <title>Creating the $LFS/cross-tools Directory</title>
 
   <para>All programs compiled in <xref linkend="chapter-cross-tools"/> will
-  be installed under <filename class="directory">$HOME/cross-tools</filename>
+  be installed under <filename class="directory">$LFS/cross-tools</filename>
   to keep them separate from the host programs. The programs compiled here are
   cross tools and will not be a part of the final LFS system. By keeping these
@@ -21,5 +21,5 @@
   the <systemitem class="username">lfs</systemitem> user:</para>
 
-<screen><userinput>install -d $HOME/cross-tools</userinput></screen>
+<screen><userinput>install -d $LFS/cross-tools</userinput></screen>
 
   <para>The next step is to create a <filename
@@ -30,16 +30,10 @@
   <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput>exit
-LFSHOME=`echo ~lfs`
-ln -s $LFSHOME/cross-tools /
-unset LFSHOME
-su - lfs</userinput></screen>
+<screen><userinput>ln -s $LFS/cross-tools /</userinput></screen>
 
-  <para>TO BE REWRITTEN - The created symlink enables the toolchain to be
-  compiled so that
+  <para>The created symlink enables the toolchain to be compiled so that
   it always refers to <filename class="directory">/cross-tools</filename>,
-  meaning that the compiler, assembler, and linker will work both in
-  this chapter and this host architecture and in the next (when we are
-  <quote>chrooted</quote> to the LFS partition).</para>
+  meaning that the compiler, assembler, and linker will be avaialble for
+  use later if some unforseen circumstances happen.</para>
 
 </sect1>
Index: BOOK/final-preps/creatingtoolsdir.xml
===================================================================
--- BOOK/final-preps/creatingtoolsdir.xml	(revision 351f3e1f13e40e6743568c7f0309109b7ef15c34)
+++ BOOK/final-preps/creatingtoolsdir.xml	(revision 6b369e9dd1cff8c3a1f1c97835bafdc0673212a2)
@@ -40,11 +40,8 @@
   </note>
 
-  <para>TO BE REWRiTTEN - The created symlink enables the toolchain to be
-  compiled so that
+  <para>The created symlink enables the toolchain to be compiled so that
   it always refers to <filename class="directory">/tools</filename>,
-  meaning that the compiler, assembler, and linker will work both in
-  this chapter (when we are still using some tools from the host) and in
-  the next (when we are <quote>chrooted</quote> to the LFS
-  partition).</para>
+  meaning that the compiler, assembler, and linker will work. This will
+  provide a common place for our temporary tools system.</para>
 
 </sect1>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 351f3e1f13e40e6743568c7f0309109b7ef15c34)
+++ BOOK/introduction/common/changelog.xml	(revision 6b369e9dd1cff8c3a1f1c97835bafdc0673212a2)
@@ -53,4 +53,9 @@
 		correct the date in changelog.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Moved Cross-tools from $HOME to LFS. This provide a easy way
+          for livecd builders to not loose valueable build time, if something goes
+          wrong.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
