diff --git a/chapter05/binutils-pass1-inst.xml b/chapter05/binutils-pass1-inst.xml
index 7ac9f31c3..70b4abff8 100644
--- a/chapter05/binutils-pass1-inst.xml
+++ b/chapter05/binutils-pass1-inst.xml
@@ -81,9 +81,9 @@ variable specifies the linker's default library search path. You'll see how this
 preparation is utilised later on in the chapter.</para></listitem>
 </itemizedlist>
 
-<caution><para>Do not yet remove the Binutils build and source
-directories. You will need them again in their current state a bit further on
-in this chapter.</para></caution>
+<warning><para>Do not yet remove the Binutils build and source directories. You
+will need them again in their current state a bit further on in this
+chapter.</para></warning>
 
 </sect2>
 
diff --git a/chapter05/binutils-pass2-inst.xml b/chapter05/binutils-pass2-inst.xml
index 35bdae13d..7b46d7ce8 100644
--- a/chapter05/binutils-pass2-inst.xml
+++ b/chapter05/binutils-pass2-inst.xml
@@ -54,9 +54,9 @@ chapter:</para>
 <para><screen><userinput>make -C ld clean
 make -C ld LIB_PATH=/usr/lib:/lib</userinput></screen></para>
 
-<caution><para>Do not yet remove the Binutils source and build
-directories. We'll need these directories again in the next chapter in the
-state they are in now.</para></caution>
+<warning><para>Do not yet remove the Binutils source and build directories.
+We'll need these directories again in the next chapter in the state they are in
+now.</para></warning>
 
 </sect2>
 
diff --git a/chapter06/adjustingtoolchain.xml b/chapter06/adjustingtoolchain.xml
index 4a79ba2bb..b033a8d3f 100644
--- a/chapter06/adjustingtoolchain.xml
+++ b/chapter06/adjustingtoolchain.xml
@@ -14,6 +14,16 @@ adjusted linker by running the following from within the
 
 <para><screen><userinput>make -C ld INSTALL=/tools/bin/install install</userinput></screen></para>
 
+<note><para>If you somehow missed the earlier warning to retain the Binutils
+source and build directories from the second pass in Chapter 5 or otherwise
+accidentally deleted them or just don't have access to them, don't worry, all is
+not lost. Just ignore this step. The result will be that the next package,
+Binutils, will link against the Glibc libraries in
+<filename class="directory">/tools</filename> rather than
+<filename class="directory">/usr</filename>. This is not ideal, however, our
+testing has shown that the resulting Binutils program binaries should be
+identical.</para></note>
+
 <para>From now on every compiled program will link <emphasis>only</emphasis>
 against the libraries in <filename>/usr/lib</filename> and
 <filename>/lib</filename>. The extra
diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml
index cd45f41a3..71df04e4c 100644
--- a/chapter06/chroot.xml
+++ b/chapter06/chroot.xml
@@ -7,6 +7,12 @@ the packages we need. Before you can chroot, however, you need to become
 <emphasis>root</emphasis>, since only <emphasis>root</emphasis>
 can execute the <userinput>chroot</userinput> command.</para>
 
+<para>Just like earlier, ensure the LFS environment variable is set up properly
+(if you decided to make use of it) by running <userinput>echo $LFS</userinput>
+and ensuring it shows the path to your LFS partition's mount point, which is
+<filename class="directory">/mnt/lfs</filename> if you followed our
+example.</para>
+
 <para>Become <emphasis>root</emphasis> and run the following command
 to enter the chroot environment:</para>