Index: chapter06/chapter06.xml
===================================================================
--- chapter06/chapter06.xml	(revision 6f16853bdb8adbf8d040f786edb9db1e01a86862)
+++ chapter06/chapter06.xml	(revision 6c672426f85596f90903645f78d510d52f2846a5)
@@ -40,5 +40,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
@@ -66,10 +65,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.xml"/>
-
-  <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/> 
@@ -86,7 +79,16 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
 
   <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
+  <!-- props needs libsystemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
 
   <!-- sysv only -->
@@ -95,9 +97,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>
Index: chapter06/createfiles.xml
===================================================================
--- chapter06/createfiles.xml	(revision 6f16853bdb8adbf8d040f786edb9db1e01a86862)
+++ chapter06/createfiles.xml	(revision 6c672426f85596f90903645f78d510d52f2846a5)
@@ -40,38 +40,25 @@
   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
-ln -sv bash /bin/sh
-
-
-</userinput></screen>
--->
-<!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la -->
-
-<!--<screen revision="systemd"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin-->
 <screen><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
-ln -sv /tools/bin/{env,install,perl} /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
-for lib in blkid lzma mount uuid
+ln -sv /tools/bin/{env,install,perl}                /usr/bin
+ln -sv /tools/lib/libgcc_s.so{,.1}                  /usr/lib
+ln -sv /tools/lib/libstdc++.{a,so{,.6}}             /usr/lib
+
+install -vdm755 /usr/lib/pkgconfig
+
+ln -sv bash /bin/sh</userinput></screen>
+
+<!--for lib in blkid lzma mount uuid
 do
     ln -sv /tools/lib/lib$lib.so* /usr/lib
-done
-ln -svf /tools/include/blkid    /usr/include
+done-->
+<!--ln -svf /tools/include/blkid    /usr/include
 ln -svf /tools/include/libmount /usr/include
-ln -svf /tools/include/uuid     /usr/include
-install -vdm755 /usr/lib/pkgconfig
-for pc in blkid mount uuid
+ln -svf /tools/include/uuid     /usr/include-->
+<!--for pc in blkid mount uuid
 do
     sed 's@tools@usr@g' /tools/lib/pkgconfig/${pc}.pc \
         > /usr/lib/pkgconfig/${pc}.pc
-done
-ln -sv bash /bin/sh</userinput></screen>
-
-<!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
-   sed 's/tools/usr/' /tools/lib/lib${lib}.la > /usr/lib/lib${lib}.la-->
+done-->
   <variablelist>
     <title>The purpose of each link:</title>
@@ -105,4 +92,12 @@
         <para>This is to satisfy one of the tests in Glibc's test suite, which
         expects <filename>/bin/echo</filename>.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter><filename>/usr/bin/env</filename></parameter></term>
+      <listitem>
+        <para>This pathname is hard-coded into some packages build procedures.
+        <!-- systemd  This may not be needed if we move sysd to the end--></para>
       </listitem>
     </varlistentry>
@@ -183,12 +178,12 @@
 -->
     <!--<varlistentry revision="systemd">-->
-    <varlistentry>
+<!--    <varlistentry>
       <term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term>
       <listitem>
-        <para>These links prevent <!--systemd--> utilities from acquiring an
+        <para>These links prevent utilities from acquiring an
         unnecessary reference to the
         <filename class="directory">/tools</filename> directory.</para>
       </listitem>
-    </varlistentry>
+    </varlistentry>-->
 
     <varlistentry>
Index: chapter06/e2fsprogs.xml
===================================================================
--- chapter06/e2fsprogs.xml	(revision 6f16853bdb8adbf8d040f786edb9db1e01a86862)
+++ chapter06/e2fsprogs.xml	(revision 6c672426f85596f90903645f78d510d52f2846a5)
@@ -118,11 +118,15 @@
 
 <screen><userinput remap="make">make</userinput></screen>
-
+<!--
     <para>To set up and run the test suite we need to first link some 
     libraries from /tools/lib to a location where the test programs look.
     To run the tests, issue:</para>
-
-<screen><userinput remap="test">ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib
-make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>
+-->
+
+    <para>To run the tests, issue:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
+<!--ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib -->
+<!--make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>-->
 
     <para>One of the E2fsprogs tests will attempt to allocate 256 MB of memory.
Index: chapter06/libelf.xml
===================================================================
--- chapter06/libelf.xml	(revision 6f16853bdb8adbf8d040f786edb9db1e01a86862)
+++ chapter06/libelf.xml	(revision 6c672426f85596f90903645f78d510d52f2846a5)
@@ -15,5 +15,5 @@
   </sect1info>
 
-  <title>Libelf &elfutils-version;</title>
+  <title>Libelf from Elfutils-&elfutils-version;</title>
 
   <indexterm zone="ch-system-libelf">
Index: chapter06/make.xml
===================================================================
--- chapter06/make.xml	(revision 6f16853bdb8adbf8d040f786edb9db1e01a86862)
+++ chapter06/make.xml	(revision 6c672426f85596f90903645f78d510d52f2846a5)
@@ -41,5 +41,5 @@
     <title>Installation of Make</title>
 
-    <para>Again, work around an error caused by glibc-2.27:</para>
+    <para>Again, work around an error caused by glibc-2.27 and later:</para>
 
 <screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
