Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 0f322d5e32063dda727d9eb6b9d0db25aa98bdf4)
+++ chapter01/changelog.xml	(revision d1a862d74d0ce5562de4a207d243466ce6285551)
@@ -44,4 +44,14 @@
 -->
     <listitem>
+      <para>2017-05-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Add additional symlinks to avoid "/tools" references
+          in final system.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2017-05-07</para>
       <itemizedlist>
Index: chapter06/createfiles.xml
===================================================================
--- chapter06/createfiles.xml	(revision 0f322d5e32063dda727d9eb6b9d0db25aa98bdf4)
+++ chapter06/createfiles.xml	(revision d1a862d74d0ce5562de4a207d243466ce6285551)
@@ -35,11 +35,11 @@
   </indexterm>
 
-  <para>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 this chapter after the software
-  has been installed:</para>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,pwd,stty} /bin
-ln -sv /tools/bin/perl /usr/bin
+  <para>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 this chapter after the
+  software has been installed:</para>
+
+<screen revision="sysv"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
+ln -sv /tools/bin/{install,perl} /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
 ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
@@ -47,4 +47,16 @@
 ln -sv bash /bin/sh</userinput></screen>
 
+<screen revision="systemd"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
+ln -sv /tools/bin/{install,perl} /usr/bin
+ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
+ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
+sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
+for lib in blkid lzma mount uuid
+do
+    ln -sv /tools/lib/lib$lib.{a,so*} /usr/lib
+    sed 's/tools/usr/' /tools/lib/lib${lib}.la > /usr/lib/lib${lib}.la
+done
+ln -sv bash /bin/sh</userinput></screen>
+
   <variablelist>
     <title>The purpose of each link:</title>
@@ -66,4 +78,12 @@
 
     <varlistentry>
+      <term><parameter><filename>/bin/dd</filename></parameter></term>
+      <listitem>
+        <para>The path to <filename>dd</filename> will be hard-coded into the
+        <filename>/usr/bin/libtool</filename> utility.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term><parameter><filename>/bin/echo</filename></parameter></term>
       <listitem>
@@ -74,8 +94,34 @@
 
     <varlistentry>
+      <term><parameter><filename>/usr/bin/install</filename></parameter></term>
+      <listitem>
+        <para>The path to <filename>install</filename> will be hard-coded into
+        the <filename>/usr/lib/bash/Makefile.inc</filename> file.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter><filename>/bin/ln</filename></parameter></term>
+      <listitem>
+        <para>The path to <filename>ln</filename> will be hard-coded into the
+        <filename>/usr/lib/perl5/&perl-version;/&lt;target-triplet&gt;/Config_heavy.pl</filename>
+         file.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term><parameter><filename>/bin/pwd</filename></parameter></term>
       <listitem>
         <para>Some <command>configure</command> scripts, particularly Glibc's,
         have this pathname hard-coded.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter><filename>/bin/rm</filename></parameter></term>
+      <listitem>
+        <para>The path to <filename>rm</filename> will be hard-coded into the
+        <filename>/usr/lib/perl5/&perl-version;/&lt;target-triplet&gt;/Config_heavy.pl</filename>
+         file.</para>
       </listitem>
     </varlistentry>
@@ -118,4 +164,13 @@
         reference that would otherwise be in
         <filename>/usr/lib/libstdc++.la</filename> after GCC is installed.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry revision="systemd">
+      <term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term>
+      <listitem>
+        <para>These links prevent systemd utilties from being poluted with an
+        unnecessary reference to the
+        <filename class="directory">/tools</filename> directory.</para>
       </listitem>
     </varlistentry>
Index: general.ent
===================================================================
--- general.ent	(revision 0f322d5e32063dda727d9eb6b9d0db25aa98bdf4)
+++ general.ent	(revision d1a862d74d0ce5562de4a207d243466ce6285551)
@@ -1,12 +1,12 @@
-<!ENTITY version         "SVN-20170507">
+<!ENTITY version         "SVN-20170513">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20170507-systemd">
+<!ENTITY versiond        "20170513-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "May 7, 2017">
+<!ENTITY releasedate     "May 13, 2017">
 
 <!ENTITY copyrightdate   "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
