diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index 86ce11068..36a04ae34 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -32,16 +32,20 @@ of the alternative means of downloading listed on
 <para>You'll need to store all the downloaded packages and patches somewhere
 that is conveniently available throughout the entire build. You'll also need a
 working directory in which to unpack the sources and build them. A scheme that
-works well is to use <filename>$LFS/tools/sources/packages</filename> for the
-tarballs, and <filename>$LFS/tools/sources</filename> as the working directory
-<emphasis>and</emphasis> as the place to store the patches. In this way,
-everything will be on the LFS partition and available during all stages of the
-building process.</para>
+works well is to use <filename>$LFS/sources</filename> as the place to store
+the tarballs and patches, <emphasis>and</emphasis> as a working directory.
+This way everything you need will be located on the LFS partition and available
+during all stages of the building process.</para>
 
-<para>So you may want to execute the following command before starting
-your download session:</para>
+<para>So you may want to execute, as <emphasis>root</emphasis>, the following
+command before starting your download session:</para>
 
-<screen><userinput>mkdir -p $LFS/tools/sources/packages</userinput></screen>
+<screen><userinput>mkdir $LFS/sources</userinput></screen>
+
+<para>And make this directory writable (and sticky) for your normal user -- as
+you won't do the downloading as <emphasis>root</emphasis>, we guess:</para>
+
+<screen><userinput>chmod a+wt $LFS/sources</userinput></screen>
 
 <!--
 <para>For your convenience the top of the list contains a link to a file
diff --git a/chapter05/adding-user.xml b/chapter05/adding-user.xml
index 65aaa8a2d..4f6f487c5 100644
--- a/chapter05/adding-user.xml
+++ b/chapter05/adding-user.xml
@@ -19,6 +19,11 @@ of the directory:</para>
 
 <screen><userinput>chown lfs $LFS/tools</userinput></screen>
 
+<para>If you made a separate working directory as suggested, give user
+<emphasis>lfs</emphasis> ownership of this directory too:</para>
+
+<screen><userinput>chown lfs $LFS/sources</userinput></screen>
+
 <para>Next, login as user <emphasis>lfs</emphasis>. This can be done via a
 virtual console, through a display manager, or with the following substitute
 user command:</para>
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index 60f65bb8e..0c0f03cff 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -3,19 +3,25 @@
 <?dbhtml filename="revisedchroot.html" dir="chapter06"?>
 
 <para>From now on when you exit the chroot environment and wish to re-enter
-it, you should run the following modified chroot command.</para>
-
-<para>Additionally, now that all software has been installed, there is no longer
-a need for the <filename class="directory">/tools</filename> directory. You may
-delete it. This will also remove the temporary copies of Tcl, Expect and
-DejaGnu, which were used for running tests on the software as it was built. If
-you want to use these programs later, you will need to compile and install them
-on your new LFS system.</para>
+it, you should run the following modified chroot command:</para>
 
 <screen><userinput>chroot $LFS /usr/bin/env -i \
 &nbsp;&nbsp;&nbsp;&nbsp;HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
 &nbsp;&nbsp;&nbsp;&nbsp;PATH=/bin:/usr/bin:/sbin:/usr/sbin \
 &nbsp;&nbsp;&nbsp;&nbsp;/bin/bash --login</userinput></screen>
 
+<para>Additionally, now that all software has been installed, there is no longer
+a need for the <filename class="directory">/tools</filename> directory. You may
+delete it. As this will also remove the temporary copies of Tcl, Expect and
+DejaGnu, which were used for running the toolchain tests, you will need to
+recompile and re-install them on your LFS system if you want to use these
+programs later.</para>
+
+<para>Also you may now want to move the contents of
+<filename class="directory">/sources</filename> to
+<filename class="directory">/usr/src/packages</filename> or something similar
+(or simply delete them if you've burned them on a CD) and delete the
+directory.</para>
+
 </sect1>