Index: chapter05/adjusting.xml
===================================================================
--- chapter05/adjusting.xml	(revision b4cd3c5bebdaf1de7e0beb53c8115d1ba34292c5)
+++ chapter05/adjusting.xml	(revision fa994c9e4c8668614143158ee7c3d6c8253cf529)
@@ -16,24 +16,17 @@
   compiler's specs file need to be adjusted.</para>
 
-  <para>The linker, adjusted at the end of the first pass of Binutils,
-  is installed by running the following command from within the
-  <filename class="directory">binutils-build</filename> directory:</para>
+  <para>The linker, adjusted at the end of the first pass of Binutils, needs
+  to be renamed so that it can be properly found and used. First, backup the
+  original linker, then replace it with the adjusted linker. We'll also
+  create a link to its counterpart in <filename class="directory">
+  /tools/$(gcc -dumpmachine)/bin</filename></para>
 
-<screen><userinput>make -C ld install</userinput></screen>
+<screen><userinput>mv -v /tools/bin/{ld,ld-old}
+mv -v /tools/$(gcc -dumpmachine)/bin/{ld,ld-old}
+mv -v /tools/bin/{ld-new,ld}
+ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
 
   <para>From this point onwards, everything will link only against the
   libraries in <filename class="directory">/tools/lib</filename>.</para>
-
-  <note>
-    <para>If the earlier warning to retain the Binutils source and
-    build directories from the first pass was missed, ignore the above
-    command. This results in a small chance that the subsequent testing
-    programs will link against libraries on the host. This is not ideal,
-    but it is not a major problem. The situation is corrected when the
-    second pass of Binutils is installed later.</para>
-  </note>
-
-  <para>Now that the adjusted linker is installed, the Binutils build and source
-  directories should be removed.</para>
 
   <para>The next task is to point GCC to the new dynamic linker. This is done by
Index: chapter05/bash.xml
===================================================================
--- chapter05/bash.xml	(revision b4cd3c5bebdaf1de7e0beb53c8115d1ba34292c5)
+++ chapter05/bash.xml	(revision fa994c9e4c8668614143158ee7c3d6c8253cf529)
@@ -47,10 +47,10 @@
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the configure option:</title>
 
       <varlistentry>
         <term><parameter>--without-bash-malloc</parameter></term>
         <listitem>
-          <para>This options turns off the use of Bash's memory allocation
+          <para>This option turns off the use of Bash's memory allocation
           (<function>malloc</function>) function which is known to cause
           segmentation faults. By turning this option off, Bash will use
Index: chapter05/binutils-pass1.xml
===================================================================
--- chapter05/binutils-pass1.xml	(revision b4cd3c5bebdaf1de7e0beb53c8115d1ba34292c5)
+++ chapter05/binutils-pass1.xml	(revision fa994c9e4c8668614143158ee7c3d6c8253cf529)
@@ -106,5 +106,6 @@
 
 <screen><userinput>make -C ld clean
-make -C ld LIB_PATH=/tools/lib</userinput></screen>
+make -C ld LIB_PATH=/tools/lib
+cp -v ld/ld-new /tools/bin</userinput></screen>
 
     <variablelist>
@@ -135,10 +136,4 @@
     </variablelist>
 
-    <warning>
-      <para><emphasis>Do not</emphasis> remove the Binutils build and source
-      directories yet. These will be needed again in their current state later
-      in this chapter.</para>
-    </warning>
-
   </sect2>
 
Index: chapter05/binutils-pass2.xml
===================================================================
--- chapter05/binutils-pass2.xml	(revision b4cd3c5bebdaf1de7e0beb53c8115d1ba34292c5)
+++ chapter05/binutils-pass2.xml	(revision fa994c9e4c8668614143158ee7c3d6c8253cf529)
@@ -50,5 +50,5 @@
 
 <screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
-    --disable-nls --enable-shared --with-lib-path=/tools/lib</userinput></screen>
+    --disable-nls --with-lib-path=/tools/lib</userinput></screen>
 
     <variablelist>
@@ -87,11 +87,7 @@
 
 <screen><userinput>make -C ld clean
-make -C ld LIB_PATH=/usr/lib:/lib</userinput></screen>
+make -C ld LIB_PATH=/usr/lib:/lib
+cp -v ld/ld-new /tools/bin</userinput></screen>
 
-    <warning>
-      <para><emphasis>Do not</emphasis> remove the Binutils source and build
-      directories yet. These directories will be needed again in the next
-      chapter in their current state.</para>
-    </warning>
 
   </sect2>
Index: chapter05/gcc-pass1.xml
===================================================================
--- chapter05/gcc-pass1.xml	(revision b4cd3c5bebdaf1de7e0beb53c8115d1ba34292c5)
+++ chapter05/gcc-pass1.xml	(revision fa994c9e4c8668614143158ee7c3d6c8253cf529)
@@ -94,5 +94,5 @@
 
     <variablelist>
-      <title>The meaning of the make parameters:</title>
+      <title>The meaning of the make parameter:</title>
 
       <varlistentry>
Index: chapter05/gettext.xml
===================================================================
--- chapter05/gettext.xml	(revision b4cd3c5bebdaf1de7e0beb53c8115d1ba34292c5)
+++ chapter05/gettext.xml	(revision fa994c9e4c8668614143158ee7c3d6c8253cf529)
@@ -51,5 +51,5 @@
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the configure option:</title>
 
       <varlistentry>
Index: chapter05/grep.xml
===================================================================
--- chapter05/grep.xml	(revision b4cd3c5bebdaf1de7e0beb53c8115d1ba34292c5)
+++ chapter05/grep.xml	(revision fa994c9e4c8668614143158ee7c3d6c8253cf529)
@@ -48,5 +48,5 @@
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the configure option:</title>
 
       <varlistentry>
Index: chapter05/introduction.xml
===================================================================
--- chapter05/introduction.xml	(revision b4cd3c5bebdaf1de7e0beb53c8115d1ba34292c5)
+++ chapter05/introduction.xml	(revision fa994c9e4c8668614143158ee7c3d6c8253cf529)
@@ -53,8 +53,5 @@
     <para>After installing each package, delete its source and build directories,
     unless specifically instructed otherwise. Deleting the sources prevents
-    mis-configuration when the same package is reinstalled later. Only three
-    of the packages need to retain the source and build directories in order
-    for their contents to be used by later commands. Pay special attention to
-    these reminders.</para>
+    mis-configuration when the same package is reinstalled later.</para>
   </important>
 
