Sync with trunk r10891, update to udev-1.10.6, update to systemd-228.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10982 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

63 files changed, 724 insertions, 596 deletions

diff --git a/appendices/acknowledgments.xml b/appendices/acknowledgments.xml
index 5944fca53..340951148 100644
--- a/appendices/acknowledgments.xml
+++ b/appendices/acknowledgments.xml
@@ -7,7 +7,7 @@
 
 <appendix id="appendixb" xreflabel="Appendix B">
   <?dbhtml dir="appendices"?>
-  <?dbhtml filename="acknowledgements.html"?>
+  <?dbhtml filename="acknowledgments.html"?>
 
   <title>Acknowledgments</title>
 
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 79ff7c0d1..37a249770 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -25,7 +25,7 @@
   available in order to run the test suites. The third list of dependencies are
   packages that require this package to be built and installed in its final
   location before they are built and installed. In most cases, this is because
-  these packages will hardcode paths to binaries within their scripts. If not
+  these packages will hard code paths to binaries within their scripts. If not
   built in a certain order, this could result in paths of /tools/bin/[binary]
   being placed inside scripts installed to the final system. This is obviously
   not desirable.</para>
@@ -33,9 +33,9 @@
   <para>The last list of dependencies are optional packages that are not
   addressed in LFS, but could be useful to the user.  These packages may have
   additional mandatory or optional dependencies of their own.  For these
-  dependencies, the recommeded practice is to install them after completion of
-  the LFS book and then go back an rebuild the LFS package.  In several cases,
-  reinstallation is addressed in BLFS.</para>
+  dependencies, the recommended practice is to install them after completion of
+  the LFS book and then go back and rebuild the LFS package.  In several cases,
+  re-installation is addressed in BLFS.</para>
 
 <!-- Begin Acl dependency info -->
   <bridgehead renderas="sect2" id="acl-dep">acl</bridgehead>
@@ -735,7 +735,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Bison (suppressed) and Gawk</seg>
+          <seg>Bison and Gawk</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1533,7 +1533,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>OpenSSL</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d1ea0c7dc..8d2be271d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,143 @@
 -->
 
     <listitem>
+      <para>2015-12-31</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Use 'ipv4" instead of "yes" for DCHP configuration in
+          systemd-networkd configuration.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Modify text in network configuration page to more
+          accurately reflect current version of systemd.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Change build order for gperf before expat.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Change build order for systemd before procps-ng.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Add --with-systemd to procps-ng configuration.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to systemd-228.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to DBus-1.10.6.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Sync to LFS r10981.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Add OpenSSL as optional kernel dependency - Merged
+          from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to findutils-4.6.0 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to gettext-0.19.7 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to linux-4.3.3 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Reword FHS Compliance Note - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to perl-5.22.1 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to perl-5.22.1 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to man-pages-4.03 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Fix xz problem identified upstream - Merged from
+          trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to gcc-5.3.0 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to gmp-6.1.0 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update host requirements to require GCC-4.7 or
+          later - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Clarify that setting and using the LFS variable
+          assumes the bash shell - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to flex-2.6.0 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to man-db-2.7.5 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to kmod-22 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Add glibc-2.22-largefile-1.patch.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to linux-4.3 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to iproute2-4.3.0 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to grep-2.22 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to util-linux-2.27.1 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Revise version-check.sh to flag bad /bin/sh
+          symlinks - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to less-481 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to man-db-2.7.4 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to tzdata2015g - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Many updates to installed files and directories.  Huge
+          thanks to Fernando - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Reset location of anduin hosted files - Merged from
+          trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Change references to ncursesw5 to
+          ncursesw6.  Thanks to Pierre Labastie for the patch - Merged from
+          trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to gettext-0.19.6 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to file-5.25 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to pkg-config-0.29 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to xz-5.2.2 - Merged from trunk.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2015-09-28</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0906688ea..384c94813 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -40,27 +40,27 @@
     <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Binutils &binutils-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Bison &bison-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Bzip2 &bzip2-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Check &check-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Coreutils &coreutils-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>D-Bus-&dbus-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>DejaGNU &dejagnu-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
@@ -76,15 +76,15 @@
     <listitem>
       <para>File &file-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Findutils &findutils-version;</para>
-    </listitem>-->
-    <!--<listitem>
-      <para>Flex &flex-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
-      <para>Gawk &gawk-version;</para>
+      <para>Flex &flex-version;</para>
     </listitem>
+    <!--<listitem>
+      <para>Gawk &gawk-version;</para>
+    </listitem>-->
     <listitem>
       <para>GCC &gcc-version;</para>
     </listitem>
@@ -94,18 +94,18 @@
     <listitem>
       <para>Gettext &gettext-version;</para>
     </listitem>
-    <listitem>
-      <para>Glibc &glibc-version;</para>
-    </listitem>
     <!--<listitem>
-      <para>GMP &gmp-version;</para>
+      <para>Glibc &glibc-version;</para>
     </listitem>-->
+    <listitem>
+      <para>GMP &gmp-version;</para>
+    </listitem>
     <!--<listitem>
       <para>Gperf-&gperf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Grep &grep-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Groff &groff-version;</para>
     </listitem>-->
@@ -118,30 +118,30 @@
     <!--<listitem>
       <para>IANA-Etc &iana-etc-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Inetutils &inetutils-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Intltool-&intltool-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>IPRoute2 &iproute2-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>Kbd &kbd-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Kmod &kmod-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Less &less-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Libcap-&libcap-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Libpipeline &libpipeline-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Libtool &libtool-version;</para>
     </listitem>-->
@@ -160,28 +160,28 @@
     <listitem>
       <para>Man-pages &man-pages-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>MPC &mpc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>MPFR &mpfr-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Ncurses &ncurses-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Patch &patch-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Perl &perl-version;</para>
     </listitem>
-    <!--<listitem>
-      <para>Pkg-config &pkgconfig-version;</para>
-    </listitem>-->
     <listitem>
-      <para>Procps-ng &procps-ng-version;</para>
+      <para>Pkg-config &pkgconfig-version;</para>
     </listitem>
     <!--<listitem>
+      <para>Procps-ng &procps-ng-version;</para>
+    </listitem>-->
+    <!--<listitem>
       <para>Psmisc &psmisc-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -202,9 +202,9 @@
     <!--<listitem>
       <para>Tcl-core-&tcl-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Texinfo &texinfo-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Tzdata &tzdata-version;</para>
     </listitem>
@@ -239,28 +239,20 @@
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
     <listitem>
-      <para>&bash-fixes-patch;</para>
+      <para>&glibc-largefile-patch;</para>
     </listitem>
-<!--
-    <listitem>
-      <para>&gcc-upstream-patch;</para>
-    </listitem>
--->
-    <listitem>
+
+    <!--<listitem>
       <para>&glibc-upstream-patch;</para>
-    </listitem>
+    </listitem>-->
 
-    <listitem>
+    <!--<listitem>
       <para>&mpfr-upstream-patch;</para>
-    </listitem>
-
-    <listitem>
-      <para>&systemd-compat-patch;</para>
-    </listitem>
+    </listitem>-->
 
-    <listitem>
+    <!--<listitem>
       <para>Tcl-core-&tcl-version;</para>
-    </listitem>
+    </listitem>-->
 
   </itemizedlist>
 
@@ -268,22 +260,17 @@
     <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
-    <listitem>
+    <!--<listitem>
       <para>bash-4.3.30-upstream_fixes-1.patch</para>
-    </listitem>
+    </listitem>-->
 
-    <listitem>
+    <!--<listitem>
       <para>mpfr-3.1.2-upstream_fixes-3.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>systemd-219-compat-1.patch</para>
-    </listitem>
+    </listitem>-->
 
-    <listitem>
+    <!--<listitem>
       <para>Tcl-8.6.3</para>
-    </listitem>
-
+    </listitem>-->
 
   </itemizedlist>
 
diff --git a/chapter02/aboutlfs.xml b/chapter02/aboutlfs.xml
index fe8a97902..3965ab889 100644
--- a/chapter02/aboutlfs.xml
+++ b/chapter02/aboutlfs.xml
@@ -28,11 +28,13 @@
   <quote>/mnt/lfs</quote> (or whatever the variable was set to) when it
   processes the command line.</para>
 
+  <caution>
   <para>Do not forget to check that <envar>LFS</envar> is set whenever
   you leave and reenter the current working environment (such as when doing a
   <command>su</command> to <systemitem class="username">root</systemitem> or
   another user). Check that the <envar>LFS</envar> variable is set up
   properly with:</para>
+  </caution>
 
 <screen role="nodump"><userinput>echo $LFS</userinput></screen>
 
@@ -45,6 +47,10 @@
   <note><para>One way to ensure that the <envar>LFS</envar> variable is always
   set is to edit the <filename>.bash_profile</filename> file in both your
   personal home directory and in  <filename>/root/.bash_profile</filename> and
-  enter the export command above.  </para></note>
+  enter the export command above.  In addition, the shell specified in the
+  <filename>/etc/passwd</filename> file for all users that need the
+  <envar>LFS</envar> variable needs to be bash to ensure that the
+  <filename>/root/.bash_profile</filename> file is incorporated as a part of
+  the login process.</para></note>
 
 </sect1>
diff --git a/chapter02/creatingfilesystem.xml b/chapter02/creatingfilesystem.xml
index 75c81b227..22a094728 100644
--- a/chapter02/creatingfilesystem.xml
+++ b/chapter02/creatingfilesystem.xml
@@ -41,7 +41,7 @@
     </varlistentry>
   </variablelist>
 
-  <para>Other file sytems, including FAT32, NTFS, ReiserFS, JFS, and XFS are
+  <para>Other file systems, including FAT32, NTFS, ReiserFS, JFS, and XFS are
   useful for specialized purposes.  More information about these file systems
   can be found at <ulink
   url="http://en.wikipedia.org/wiki/Comparison_of_file_systems"/>.</para>
diff --git a/chapter02/mounting.xml b/chapter02/mounting.xml
index 873896384..4993f6ab8 100644
--- a/chapter02/mounting.xml
+++ b/chapter02/mounting.xml
@@ -14,7 +14,7 @@
   be made accessible. In order to do this, the partition needs to be
   mounted at a chosen mount point. For the purposes of this book, it is
   assumed that the file system is mounted under the directory specified by the
-  <envar>LFS</envar> envronment varibale as described in the previous section.
+  <envar>LFS</envar> envronment variable as described in the previous section.
   </para>
 
   <para>Create the mount point and mount the LFS file system by running:</para>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 885570743..c05a7970e 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -66,6 +66,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Glibc Largefile Patch - <token>&glibc-largefile-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-largefile-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-largefile-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&kbd-backspace-patch;"/></para>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 111ba63ec..9e2e06073 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -129,7 +129,7 @@ cd ../glibc-build</userinput></screen>
       <varlistentry>
         <term><parameter>libc_cv_c_cleanup=yes</parameter></term>
         <listitem>
-          <para>Simlarly, we pass libc_cv_c_cleanup=yes through to the
+          <para>Similarly, we pass libc_cv_c_cleanup=yes through to the
           <command>configure</command> script so that the test is skipped and C
           cleanup handling support is configured.</para>
         </listitem>
@@ -137,7 +137,7 @@ cd ../glibc-build</userinput></screen>
       <varlistentry>
         <term><parameter>libc_cv_ctors_header=yes</parameter></term>
         <listitem>
-          <para>Simlarly, we pass libc_cv_ctors_header=yes through to the
+          <para>Similarly, we pass libc_cv_ctors_header=yes through to the
           <command>configure</command> script so that the test is skipped and
           gcc constructor support is configured.</para>
         </listitem>
diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
index 29d7f2739..365babb3a 100644
--- a/chapter05/libstdc++.xml
+++ b/chapter05/libstdc++.xml
@@ -97,7 +97,7 @@ cd ../gcc-build</userinput></screen>
           <para>This is the location where the standard include files are
           searched by the C++ compiler. In a normal build, this information
           is automatically passed to the Libstdc++ <command>configure</command>
-          options from the toplevel directory. In our case, this information
+          options from the top level directory. In our case, this information
           must be explicitly given.</para>
         </listitem>
       </varlistentry>
diff --git a/chapter06/acl.xml b/chapter06/acl.xml
index 0bc379b6a..213535fd0 100644
--- a/chapter06/acl.xml
+++ b/chapter06/acl.xml
@@ -98,7 +98,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so</userinput><
 
       <seglistitem>
         <seg>chacl, getfacl, and setacl</seg>
-        <seg>libacl.{a,so}</seg>
+        <seg>libacl.so</seg>
         <seg>/usr/include/acl and /usr/share/doc/acl-&acl-version;</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml
index bc9e236a6..07c155cc2 100644
--- a/chapter06/adjusting.xml
+++ b/chapter06/adjusting.xml
@@ -55,7 +55,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
   <para>Note that <filename class="directory">/lib</filename> is now
   the prefix of our dynamic linker.</para>
 
-  <para os="d">Now make sure that we're setup to use the correct startfiles:</para>
+  <para os="d">Now make sure that we're setup to use the correct start files:</para>
 
 <screen os="e"><userinput>grep -o '/usr/lib.*/crt[1in].*succeeded' dummy.log</userinput></screen>
 
diff --git a/chapter06/attr.xml b/chapter06/attr.xml
index d6de46b88..ebcf536e5 100644
--- a/chapter06/attr.xml
+++ b/chapter06/attr.xml
@@ -91,7 +91,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so</userinput
 
       <seglistitem>
         <seg>attr, getfattr, and setattr</seg>
-        <seg>libattr.{a,so}</seg>
+        <seg>libattr.so</seg>
         <seg>/usr/include/attr and /usr/share/doc/attr-&attr-version;</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 761755018..115f311bf 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -77,10 +77,8 @@ make -j4 check</userinput></screen>
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>aclocal, aclocal-&am-minor-version;, automake,
-        automake-&am-minor-version;, compile, config.guess, config.sub,
-        depcomp, install-sh, mdate-sh, missing, mkinstalldirs,
-        py-compile, and ylwrap</seg>
+        <seg>aclocal, aclocal-&am-minor-version; (hard linked with aclocal), automake, and
+        automake-&am-minor-version; (hard linked with automake) </seg>
         <seg>/usr/share/aclocal-&am-minor-version;, /usr/share/automake-&am-minor-version;, and
         /usr/share/doc/automake-&automake-version;</seg>
       </seglistitem>
@@ -139,111 +137,6 @@ make -j4 check</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="compile">
-        <term><command>compile</command></term>
-        <listitem>
-          <para>A wrapper for compilers</para>
-          <indexterm zone="ch-system-automake compile">
-            <primary sortas="b-compile">compile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.guess">
-        <term><command>config.guess</command></term>
-        <listitem>
-          <para>A script that attempts to guess the canonical triplet for
-          the given build, host, or target architecture</para>
-          <indexterm zone="ch-system-automake config.guess">
-            <primary sortas="b-config.guess">config.guess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.sub">
-        <term><command>config.sub</command></term>
-        <listitem>
-          <para>A configuration validation subroutine script</para>
-          <indexterm zone="ch-system-automake config.sub">
-            <primary sortas="b-config.sub">config.sub</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="depcomp">
-        <term><command>depcomp</command></term>
-        <listitem>
-          <para>A script for compiling a program so that dependency information
-          is generated in addition to the desired output</para>
-          <indexterm zone="ch-system-automake depcomp">
-            <primary sortas="b-depcomp">depcomp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="install-sh">
-        <term><command>install-sh</command></term>
-        <listitem>
-          <para>A script that installs a program, script, or data file</para>
-          <indexterm zone="ch-system-automake install-sh">
-            <primary sortas="b-install-sh">install-sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mdate-sh">
-        <term><command>mdate-sh</command></term>
-        <listitem>
-          <para>A script that prints the modification time of a file or
-          directory</para>
-          <indexterm zone="ch-system-automake mdate-sh">
-            <primary sortas="b-mdate-sh">mdate-sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="missing">
-        <term><command>missing</command></term>
-        <listitem>
-          <para>A script acting as a common stub for missing GNU programs during
-          an installation</para>
-          <indexterm zone="ch-system-automake missing">
-            <primary sortas="b-missing">missing</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkinstalldirs">
-        <term><command>mkinstalldirs</command></term>
-        <listitem>
-          <para>A script that creates a directory tree</para>
-          <indexterm zone="ch-system-automake mkinstalldirs">
-            <primary sortas="b-mkinstalldirs">mkinstalldirs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="py-compile">
-        <term><command>py-compile</command></term>
-        <listitem>
-          <para>Compiles a Python program</para>
-          <indexterm zone="ch-system-automake py-compile">
-            <primary sortas="b-py-compile">py-compile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ylwrap">
-        <term><command>ylwrap</command></term>
-        <listitem>
-          <para>A wrapper for <command>lex</command> and
-          <command>yacc</command></para>
-          <indexterm zone="ch-system-automake ylwrap">
-            <primary sortas="b-ylwrap">ylwrap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
   </sect2>
diff --git a/chapter06/bc.xml b/chapter06/bc.xml
index 17be4bfcf..7f9373e52 100644
--- a/chapter06/bc.xml
+++ b/chapter06/bc.xml
@@ -73,7 +73,7 @@
 
     <para>To test bc, run the commands below. There is quite a bit of output,
     so you may want to redirect it to a file. There are a very small percentage
-    of tests (10 of 12,144) that will indicate a roundoff error at the last
+    of tests (10 of 12,144) that will indicate a round off error at the last
     digit.</para>
 
 <screen><userinput remap="test">echo "quit" | ./bc/bc -l Test/checklib.b</userinput></screen>
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index bafb23451..af88b364d 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -52,9 +52,14 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results (about 0.5 SBU), issue:</para>
+<!--
+    <para>To test the results (about 2.2 SBU), issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
+-->
+    <para>There is a circular dependency between bison and flex with regard to
+    the checks.  If desired, after installing flex in the next section, the
+    bison checks can be run with <command>make check</command>.</para>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 5607d86a2..3d98c683e 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -37,31 +37,32 @@
   <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="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="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
+  <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="diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
@@ -73,7 +74,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <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="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.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"/>
diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml
index 09ad4fd65..c49e0c5d4 100644
--- a/chapter06/creatingdirs.xml
+++ b/chapter06/creatingdirs.xml
@@ -52,16 +52,14 @@ mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput></screen>
   <sect2>
     <title>FHS Compliance Note</title>
 
-    <para>The directory tree is based on the Filesystem Hierarchy Standard (FHS)
-    (available at <ulink url="https://wiki.linuxfoundation.org/en/FHS"/>).
-    The FHS also stipulates the existence of <filename
+    <para>The directory tree is based on the Filesystem Hierarchy Standard
+    (FHS) (available at <ulink
+    url="https://wiki.linuxfoundation.org/en/FHS"/>).  The FHS also stipulates
+    the optional existence some directories such as <filename
     class="directory">/usr/local/games</filename> and <filename
-    class="directory">/usr/share/games</filename>. The FHS is not precise as to
-    the structure of the <filename class="directory">/usr/local/share</filename>
-    subdirectory, so we create only the directories that are needed. However,
-    feel free to create these directories if you prefer to conform more strictly
-    to the FHS.</para>
-
+    class="directory">/usr/share/games</filename>.  We create only the
+    directories that are needed. However, feel free to create these
+    directories.  </para>
   </sect2>
 
 </sect1>
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index a8c970a52..ee5390137 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -48,12 +48,14 @@
 
     <para>Prepare D-Bus for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                       \
-            --sysconfdir=/etc                   \
-            --localstatedir=/var                \
-            --docdir=/usr/share/doc/dbus-&dbus-version; \
-            --disable-static                    \
-            --with-console-auth-dir=/run/console</userinput></screen>
+<screen><userinput remap="configure">  ./configure --prefix=/usr                       \
+              --sysconfdir=/etc                   \
+              --localstatedir=/var                \
+              --disable-static                    \
+              --disable-doxygen-docs              \
+              --disable-xml-docs                  \
+              --docdir=/usr/share/doc/dbus-&dbus-version; \
+              --with-console-auth-dir=/run/console</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -72,9 +74,9 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>This package does come with a testsuite, but it requires several
+    <para>This package does come with a test suite, but it requires several
     packages that are not included in LFS. Instructions for running the
-    testsuite can be found in the BLFS book at
+    test suite can be found in the BLFS book at
     <ulink url="&blfs-book;general/dbus.html"/>.</para>
 
     <para>Install the package:</para>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 2ea667a3b..50637f689 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -44,12 +44,6 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
-<!--     <para>First, fix a potential security issue identified upstream:</para>
-
-<screen><userinput remap="pre">sed -e '/int.*old_desc_blocks/s/int/blk64_t/' \
-    -e '/if (old_desc_blocks/s/super->s_first_meta_bg/desc_blocks/' \
-    -i lib/ext2fs/closefs.c</userinput></screen> -->
-
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
 
@@ -177,12 +171,11 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs,e2freefrag,
         e2fsck, e2image, e2label, e2undo, e4defrag, filefrag, fsck.ext2,
         fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr, mk_cmds, mke2fs,
-        mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev, 
+        mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev, mklost+found, 
         resize2fs, and tune2fs</seg>
-        <seg>libcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so},
-        libquota.a, and libss.{a,so}</seg>
+        <seg>libcom_err.so, libe2p.so, libext2fs.so, and libss.so</seg>
         <seg>/usr/include/e2p, /usr/include/et, /usr/include/ext2fs,
-        /usr/include/quota, /usr/include/ss, /usr/share/et, and /usr/share/ss</seg>
+        /usr/include/ss, /usr/share/et, and /usr/share/ss</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -529,7 +522,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libquota">
+<!--      <varlistentry id="libquota">
         <term><filename class="libraryfile">libquota</filename></term>
         <listitem>
           <para>Provides an interface for creating and updating quota files
@@ -539,7 +532,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
           </indexterm>
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="libss">
         <term><filename class="libraryfile">libss</filename></term>
         <listitem>
diff --git a/chapter06/expat.xml b/chapter06/expat.xml
index b813a840e..9f59025b5 100644
--- a/chapter06/expat.xml
+++ b/chapter06/expat.xml
@@ -74,7 +74,7 @@ install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</user
 
       <seglistitem>
         <seg>xmlwf</seg>
-        <seg>libexpat.{a,so}</seg>
+        <seg>libexpat.so</seg>
         <seg>/usr/share/doc/expat-&expat-version;</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 6dcff4dc5..4304a264e 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -90,7 +90,7 @@ sed -i 's|find:=${BINDIR}|find:=/bin|' /usr/bin/updatedb</userinput></screen>
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>bigram, code, find, frcode, locate, oldfind, updatedb, and xargs</seg>
+        <seg>code, find, locate, oldfind, updatedb, and xargs</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -99,17 +99,6 @@ sed -i 's|find:=${BINDIR}|find:=/bin|' /usr/bin/updatedb</userinput></screen>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="bigram">
-        <term><command>bigram</command></term>
-        <listitem>
-          <para>Was formerly used to produce <command>locate</command>
-          databases</para>
-          <indexterm zone="ch-system-findutils bigram">
-            <primary sortas="b-bigram">bigram</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="code">
         <term><command>code</command></term>
         <listitem>
@@ -132,18 +121,6 @@ sed -i 's|find:=${BINDIR}|find:=/bin|' /usr/bin/updatedb</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="frcode">
-        <term><command>frcode</command></term>
-        <listitem>
-          <para>Is called by <command>updatedb</command> to compress the list
-          of file names; it uses front-compression, reducing the database size
-          by a factor of four to five</para>
-          <indexterm zone="ch-system-findutils frcode">
-            <primary sortas="b-frcode">frcode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="locate">
         <term><command>locate</command></term>
         <listitem>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 7ed596a94..c0adcfb58 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -41,13 +41,11 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
 
-    <para>First, skip running three regression tests that require Bison:</para>
-
-<screen><userinput remap="pre">sed -i -e '/test-bison/d' tests/Makefile.in</userinput></screen>
-
     <para>Prepare Flex for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr    \
+            --disable-static \
+            --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -60,14 +58,7 @@
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
-<!--
-    <para>There are some packages that expect to find the
-    <filename class="libraryfile">lex</filename> library in <filename
-    class="directory">/usr/lib</filename>. Create a symlink to account for
-    this:</para>
-
-<screen><userinput remap="install">ln -sv libfl.a /usr/lib/libl.a</userinput></screen>
--->
+
     <para>A few programs do not know about <command>flex</command> yet and
     try to run its predecessor, <command>lex</command>. To support those
     programs, create a symbolic link named <filename>lex</filename> that
@@ -88,7 +79,7 @@
 
       <seglistitem>
         <seg>flex, flex++ (link to flex), and lex (link to flex)</seg>
-        <seg>libfl.{a,so} and libfl_pic.{a,so}</seg>
+        <seg>libfl.so and libfl_pic.so</seg>
         <seg>/usr/share/doc/flex-&flex-version;</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index bf381204d..e1061987e 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -116,7 +116,8 @@ cd ../gcc-build</userinput></screen>
 
     <para>A few unexpected failures cannot always be avoided. The GCC developers
     are usually aware of these issues, but have not resolved them yet.
-    In particular, one test in the libgomp test suite is known to fail.
+    In particular, two tests in the libstdc++ test suite are known to fail
+    when running as the root user as we do here.
     Unless the test results are vastly different from those at the above URL,
     it is safe to continue.</para>
 
@@ -139,7 +140,8 @@ cd ../gcc-build</userinput></screen>
     Link Time Optimization (LTO):</para> 
 
 <screen><userinput remap="install">install -v -dm755 /usr/lib/bfd-plugins
-ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so /usr/lib/bfd-plugins/</userinput></screen>
+ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so \
+        /usr/lib/bfd-plugins/</userinput></screen>
 
     <para>Now that our final toolchain is in place, it is important to again ensure
     that compiling and linking will work as expected. We do this by performing
@@ -374,7 +376,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         <listitem>
           <para>A wrapper around <command>ar</command> that adds a
           plugin to the command line. This program is only used
-          to add "link time optization" and is not useful with the
+          to add "link time optimization" and is not useful with the
           default build options</para>
           <indexterm zone="ch-system-gcc gcc-ar">
             <primary sortas="b-gcc-ar">gc-ar</primary>
@@ -387,7 +389,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         <listitem>
           <para>A wrapper around <command>nm</command> that adds a
           plugin to the command line. This program is only used
-          to add "link time optization" and is not useful with the
+          to add "link time optimization" and is not useful with the
           default build options</para>
           <indexterm zone="ch-system-gcc gcc-nm">
             <primary sortas="b-gcc-nm">gc-nm</primary>
@@ -400,7 +402,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         <listitem>
           <para>A wrapper around <command>ranlib</command> that adds a
           plugin to the command line. This program is only used
-          to add "link time optization" and is not useful with the
+          to add "link time optimization" and is not useful with the
           default build options</para>
           <indexterm zone="ch-system-gcc gcc-ranlib">
             <primary sortas="b-gcc-ranlib">gc-ranlib</primary>
diff --git a/chapter06/gdbm.xml b/chapter06/gdbm.xml
index 662dc4324..544cb4365 100644
--- a/chapter06/gdbm.xml
+++ b/chapter06/gdbm.xml
@@ -86,7 +86,7 @@
 
       <seglistitem>
         <seg>gdbm_dump, gdbm_load, and gdbmtool</seg>
-        <seg>libgdbm.{a,so} and libgdbm_compat.{a,so}</seg>
+        <seg>libgdbm.so and libgdbm_compat.so</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index 7ad8aeb69..4792334e3 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -60,7 +60,8 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install
+chmod -v 0755 /usr/lib/preloadable_libintl.so</userinput></screen>
 
   </sect2>
 
@@ -73,11 +74,11 @@
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>autopoint, config.charset, config.rpath, envsubst, gettext, gettext.sh,
+        <seg>autopoint, envsubst, gettext, gettext.sh,
         gettextize, hostname, msgattrib, msgcat, msgcmp, msgcomm, msgconv, msgen,
         msgexec, msgfilter, msgfmt, msggrep, msginit, msgmerge, msgunfmt, msguniq,
         ngettext, recode-sr-latin, and xgettext</seg>
-        <seg>libasprintf.{a,so}, libgettextlib.so, libgettextpo.{a,so},
+        <seg>libasprintf.so, libgettextlib.so, libgettextpo.so,
         libgettextsrc.so, and preloadable_libintl.so</seg>
         <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;, and
         /usr/share/gettext</seg>
@@ -100,29 +101,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="config.charset">
-        <term><command>config.charset</command></term>
-        <listitem>
-          <para>Outputs a system-dependent table of character encoding
-          aliases</para>
-          <indexterm zone="ch-system-gettext config.charset">
-            <primary sortas="b-config.charset">config.charset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.rpath">
-        <term><command>config.rpath</command></term>
-        <listitem>
-          <para>Outputs a system-dependent set of variables, describing how
-          to set the runtime search path of shared libraries in an
-          executable</para>
-          <indexterm zone="ch-system-gettext config.rpath">
-            <primary sortas="b-config.rpath">config.rpath</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="envsubst">
         <term><command>envsubst</command></term>
         <listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index a55ef9722..b4973ec8d 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -70,6 +70,11 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
 
+    <para>The most recent stable version of Glibc does not handle large files
+    correctly.  Fix the problem with this patch:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-largefile-patch;</userinput></screen>
+
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 
@@ -138,7 +143,7 @@ cd ../glibc-build</userinput></screen>
       </listitem>
 -->
       <listitem>
-        <para>The <emphasis>elf/tst-protected1a</emphasis> and
+        <para>The <emphasis>elf/tst-protected1b</emphasis> and
         <emphasis>elf/tst-protected1b</emphasis> tests are known to
         fail with the current stable version of binutils.</para>
       </listitem>
@@ -271,7 +276,7 @@ EOF</userinput></screen>
     <sect3>
     <title>Adding time zone data</title>
 
-    <para>Install and set up the timezone data with the following:</para>
+    <para>Install and set up the time zone data with the following:</para>
 <screen><userinput>tar -xf ../tzdata&tzdata-version;.tar.gz
 
 ZONEINFO=/usr/share/zoneinfo
@@ -294,14 +299,14 @@ unset ZONEINFO</userinput></screen>
       <varlistentry>
         <term><parameter>zic -L /dev/null ...</parameter></term>
         <listitem>
-          <para>This creates posix timezones, without any leap seconds.  It is
+          <para>This creates posix time zones, without any leap seconds.  It is
           conventional to put these in both
           <filename class="directory">zoneinfo</filename> and
           <filename class="directory">zoneinfo/posix</filename>. It is
-          necessary to put the POSIX timezones in
+          necessary to put the POSIX time zones in
           <filename class="directory">zoneinfo</filename>, otherwise various
           test-suites will report errors. On an embedded system, where space is
-          tight and you do not intend to ever update the timezones, you could save
+          tight and you do not intend to ever update the time zones, you could save
           1.9MB by not using the <filename class="directory">posix</filename>
           directory, but some applications or test-suites might produce some
           failures.</para>
@@ -310,9 +315,9 @@ unset ZONEINFO</userinput></screen>
       <varlistentry>
         <term><parameter>zic -L leapseconds ...</parameter></term>
         <listitem>
-          <para>This creates right timezones, including leap seconds. On an
+          <para>This creates right time zones, including leap seconds. On an
           embedded system, where space is tight and you do not intend to
-          ever update the timezones, or care about the correct time, you could
+          ever update the time zones, or care about the correct time, you could
           save 1.9MB by omitting the <filename class="directory">right</filename>
           directory.</para>
         </listitem>
@@ -336,7 +341,7 @@ unset ZONEINFO</userinput></screen>
     <para>After answering a few questions about the location, the script will
     output the name of the time zone (e.g.,
     <emphasis>America/Edmonton</emphasis>). There are also some other possible
-    timezones listed in <filename
+    time zones listed in <filename
     class='directory'>/usr/share/zoneinfo</filename> such as
     <emphasis>Canada/Eastern</emphasis> or <emphasis>EST5EDT</emphasis> that
     are not identified by the script but can be used.</para>
diff --git a/chapter06/gmp.xml b/chapter06/gmp.xml
index c342d5f59..7d353d90c 100644
--- a/chapter06/gmp.xml
+++ b/chapter06/gmp.xml
@@ -91,10 +91,10 @@ make html</userinput></screen>
 
 <screen><userinput remap="test">make check 2>&amp;1 | tee gmp-check-log</userinput></screen>
 
-    <para>Ensure that all 188 tests in the test suite passed.
+    <para>Ensure that all 190 tests in the test suite passed.
     Check the results by issuing the following command:</para>
 
-<screen><userinput remap="test">awk '/tests passed/{total+=$2} ; END{print total}' gmp-check-log</userinput></screen>
+<screen><userinput remap="test">awk '/# PASS:/{total+=$3} ; END{print total}' gmp-check-log</userinput></screen>
 
     <para>Install the package and its documentation:</para>
 
@@ -111,7 +111,7 @@ make install-html</userinput></screen>
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>libgmp.{a,so} and libgmpxx.{a,so}</seg>
+        <seg>libgmp.so and libgmpxx.so</seg>
         <seg>/usr/share/doc/gmp-&gmp-version;</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/chapter06/gperf.xml b/chapter06/gperf.xml
index ce417439b..d8c5b6594 100644
--- a/chapter06/gperf.xml
+++ b/chapter06/gperf.xml
@@ -65,9 +65,11 @@
 
     <segmentedlist>
       <segtitle>Installed program</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>gperf</seg>
+        <seg>/usr/share/doc/gperf-&gperf-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index deeb99791..94d8204db 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -40,10 +40,6 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
 
-    <para>First fix a potential security issue identified upstream:</para>
-
-<screen><userinput remap="configure">sed -i -e '/tp++/a  if (ep &lt;= tp) break;' src/kwset.c</userinput></screen>
-
     <para>Prepare Grep for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin</userinput></screen>
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index b35c563f4..821a3e54e 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -73,13 +73,13 @@
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>addftinfo, afmtodit, chem, eqn, eqn2graph, gdiffmk,
-        geqn (link to eqn), grap2graph, grn, grodvi, groff, groffer, grog,
-        grolbp, grolj4, grops, grotty, gtbl (link to tbl), hpftodit,
-        indxbib, lkbib, lookbib, mmroff, neqn, nroff, pdfroff, pfbtops, pic,
-        pic2graph, post-grohtml, preconv, pre-grohtml, refer, roff2dvi,
-        roff2html, roff2pdf, roff2ps, roff2text, roff2x, soelim, tbl, tfmtodit,
-        and troff</seg>
+        <seg>addftinfo, afmtodit, chem, eqn, eqn2graph, gdiffmk, glilypond,
+        gperl, gpinyin, grap2graph, grn, grodvi, groff, groffer, grog, grolbp,
+        grolj4, gropdf, grops, grotty, hpftodit, indxbib, lkbib, lookbib,
+        mmroff, neqn, nroff, pdfmom, pdfroff, pfbtops, pic, pic2graph,
+        post-grohtml, preconv, pre-grohtml, refer, roff2dvi, roff2html,
+        roff2pdf, roff2ps, roff2text, roff2x, soelim, tbl, tfmtodit, and
+        troff</seg>
         <seg>/usr/lib/groff and /usr/share/doc/groff-&groff-version;,
         /usr/share/groff</seg>
       </seglistitem>
@@ -154,12 +154,35 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="geqn">
-        <term><command>geqn</command></term>
+      <varlistentry id="glilypond">
+        <term><command>glilypond</command></term>
         <listitem>
-          <para>A link to <command>eqn</command></para>
-          <indexterm zone="ch-system-groff geqn">
-            <primary sortas="b-geqn">geqn</primary>
+          <para>Transforms sheet music written in the lilypond language into
+          the groff language</para>
+          <indexterm zone="ch-system-groff glilypond">
+            <primary sortas="b-glilypond">glilypond</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gperl">
+        <term><command>gperl</command></term>
+        <listitem>
+          <para>Preprocesor for groff, allowing addition of perl code
+          into groff files</para>
+          <indexterm zone="ch-system-groff gperl">
+            <primary sortas="b-gperl">gperl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpinyin">
+        <term><command>gpinyin</command></term>
+        <listitem>
+          <para>Preprocesor for groff, allowing addition of Chinese
+          European-like language Pinyin into groff files.</para>
+          <indexterm zone="ch-system-groff gpinyin">
+            <primary sortas="b-gpinyin">gpinyin</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -254,6 +277,17 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="gropdf">
+        <term><command>gropdf</command></term>
+        <listitem>
+          <para>Translates the output of GNU <command>troff</command> to
+          PDF</para>
+          <indexterm zone="ch-system-groff gropdf">
+            <primary sortas="b-gropdf">gropdf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="grops">
         <term><command>grops</command></term>
         <listitem>
@@ -276,16 +310,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="gtbl">
-        <term><command>gtbl</command></term>
-        <listitem>
-          <para>A link to <command>tbl</command></para>
-          <indexterm zone="ch-system-groff gtbl">
-            <primary sortas="b-gtbl">gtbl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="hpftodit">
         <term><command>hpftodit</command></term>
         <listitem>
@@ -367,6 +391,17 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="pdfmom">
+        <term><command>pdfmom</command></term>
+        <listitem>
+          <para>Is a wrapper around groff that facilitates the production of PDF
+          documents from files formatted with the mom macros.</para>
+          <indexterm zone="ch-system-groff pdfmom">
+            <primary sortas="b-pdfmom">pdfmom</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="pdfroff">
         <term><command>pdfroff</command></term>
         <listitem>
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index cd730a3d5..1c3903e8a 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -94,14 +94,17 @@
 
       <seglistitem>
 
-       <seg>                      grub-bios-setup, grub-editenv,     grub-fstest,
-            grub-install,         grub-kbdcomp,    grub-menulst2cfg, grub-mkconfig,
+       <seg>grub-bios-setup,      grub-editenv,    grub-file,        grub-fstest,
+            grub-glue-efi,        grub-install,    grub-kbdcomp,     grub-macbless,
+            grub-menulst2cfg,     grub-mkconfig,
                                   grub-mkimage,    grub-mklayout,    grub-mknetdir,
             grub-mkpasswd-pbkdf2, grub-mkrelpath,  grub-mkrescue,    grub-mkstandalone,
-            grub-ofpathname,      grub-probe,      grub-reboot,      grub-script-check,
-            grub-set-default,                      grub-sparc64-setup </seg>
+            grub-ofpathname,      grub-probe,      grub-reboot,      grub-render-label,
+            grub-script-check,
+            grub-set-default,     grub-sparc64-setup, and grub-syslinux2cfg</seg>
 
-        <seg>/usr/lib/grub, /etc/grub.d, /usr/share/grub, /boot/grub</seg>
+        <seg>/usr/lib/grub, /etc/grub.d, /usr/share/grub, and boot/grub (when grub-install
+        is first run)</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -130,6 +133,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="grub-file">
+        <term><command>grub-file</command></term>
+        <listitem>
+          <para>Checks if FILE is of the specified type.</para>
+          <indexterm zone="ch-system-grub grub-file">
+            <primary sortas="b-grub-file">grub-file</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="grub-fstest">
         <term><command>grub-fstest</command></term>
         <listitem>
@@ -140,6 +153,17 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="grub-glue-efi">
+        <term><command>grub-glue-efi</command></term>
+        <listitem>
+          <para>Processes ia32 and amd64 EFI images and glues them
+          according to Apple format.</para>
+          <indexterm zone="ch-system-grub grub-glue-efi">
+            <primary sortas="b-grub-glue-efi">grub-glue-efi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="grub-install">
         <term><command>grub-install</command></term>
         <listitem>
@@ -161,6 +185,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="grub-macbless">
+        <term><command>grub-macbless</command></term>
+        <listitem>
+          <para>Mac-style bless on HFS or HFS+ files</para>
+          <indexterm zone="ch-system-grub grub-macbless">
+            <primary sortas="b-grub-macbless">grub-macbless</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="grub-menulst2cfg">
         <term><command>grub-menulst2cfg</command></term>
         <listitem>
@@ -283,6 +317,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="grub-render-label">
+        <term><command>grub-render-label</command></term>
+        <listitem>
+          <para>Render Apple .disk_label for Apple Macs</para>
+          <indexterm zone="ch-system-grub grub-render-label">
+            <primary sortas="b-grub-render-label">grub-render-label</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="grub-script-check">
         <term><command>grub-script-check</command></term>
         <listitem>
@@ -313,6 +357,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="grub-syslinux2cfg">
+        <term><command>grub-syslinux2cfg</command></term>
+        <listitem>
+          <para>Transform a syslinux config file into grub.cfg format</para>
+          <indexterm zone="ch-system-grub grub-syslinux2cfg">
+            <primary sortas="b-grub-syslinux2cfg">grub-syslinux2cfg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </sect2>
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 7b5a5e20a..2245666b7 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -71,8 +71,8 @@ mv -v /bin/{zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin</userinput></screen>
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>gunzip, gzexe, gzip, uncompress, zcat, zcmp, zdiff, zegrep, zfgrep,
-        zforce, zgrep, zless, zmore, and znew</seg>
+        <seg>gunzip, gzexe, gzip, uncompress (hard link with gunzip), zcat, zcmp,
+        zdiff, zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 95a846326..1eb629a8c 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -109,10 +109,11 @@
     <para>To test the results, issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
+<!--
     <para>One test, <emphasis>libls.sh</emphasis>, is known to fail due to hard
     coding of some support program paths. All tests pass if the tests are rerun
     at the end of Chapter 6.</para>
-
+-->
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
@@ -132,8 +133,8 @@ mv -v /usr/bin/ifconfig /sbin</userinput></screen>
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>ftp, ifconfig, hostname, ping, ping6, rcp, rexec, rlogin, 
-        rsh, talk, telnet, tftp, and traceroute</seg>
+        <seg>dnsdomainname, ftp, ifconfig, hostname, ping, ping6,
+        talk, telnet, tftp, and traceroute</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -142,22 +143,22 @@ mv -v /usr/bin/ifconfig /sbin</userinput></screen>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="ftp">
-        <term><command>ftp</command></term>
+      <varlistentry id="dnsdomainname">
+        <term><command>dnsdomainname</command></term>
         <listitem>
-        <para>Is the file transfer protocol program</para>
-        <indexterm zone="ch-system-inetutils ftp">
-          <primary sortas="b-ftp">ftp</primary>
+        <para>Show the system's DNS domain name</para>
+        <indexterm zone="ch-system-inetutils dnsdomainname">
+          <primary sortas="b-dnsdomainname">dnsdomainname</primary>
         </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="ifconfig">
-        <term><command>ifconfig</command></term>
+      <varlistentry id="ftp">
+        <term><command>ftp</command></term>
         <listitem>
-        <para>Manages network interfaces</para>
-        <indexterm zone="ch-system-inetutils ifconfig">
-          <primary sortas="b-ifconfig">ifconfig</primary>
+        <para>Is the file transfer protocol program</para>
+        <indexterm zone="ch-system-inetutils ftp">
+          <primary sortas="b-ftp">ftp</primary>
         </indexterm>
         </listitem>
       </varlistentry>
@@ -172,6 +173,16 @@ mv -v /usr/bin/ifconfig /sbin</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="ifconfig">
+        <term><command>ifconfig</command></term>
+        <listitem>
+        <para>Manages network interfaces</para>
+        <indexterm zone="ch-system-inetutils ifconfig">
+          <primary sortas="b-ifconfig">ifconfig</primary>
+        </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="ping">
         <term><command>ping</command></term>
         <listitem>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 412ec6f29..cfcc544ec 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -133,10 +133,10 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
         kbd_mode, kbdrate, loadkeys, loadunimap,
         mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to
         psfxtable), psfstriptable (link to psfxtable), psfxtable, <!--resizecons,-->
-        setfont, setkeycodes, setleds, setmetamode,
+        setfont, setkeycodes, setleds, setmetamode, setvtrgb,
         showconsolefont, showkey, unicode_start, and unicode_stop</seg>
         <seg>/usr/share/consolefonts, /usr/share/consoletrans, /usr/share/keymaps,
-        and /usr/share/unimaps</seg>
+        /usr/share/doc/kbd-&kbd-version;,  and /usr/share/unimaps</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -309,16 +309,6 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
         </listitem>
       </varlistentry>
 
-  <!--<varlistentry id="resizecons">
-        <term><command>resizecons</command></term>
-        <listitem>
-          <para>Changes the kernel idea of the console size</para>
-          <indexterm zone="ch-system-kbd resizecons">
-            <primary sortas="b-resizecons">resizecons</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
       <varlistentry id="setfont">
         <term><command>setfont</command></term>
         <listitem>
@@ -361,6 +351,16 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="setvtrgb">
+        <term><command>setvtrgb</command></term>
+        <listitem>
+          <para>Sets the console color map in all virtual terminals</para>
+          <indexterm zone="ch-system-kbd setvtrgb">
+            <primary sortas="b-setvtrgb">setvtrgb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="showconsolefont">
         <term><command>showconsolefont</command></term>
         <listitem>
diff --git a/chapter06/libcap.xml b/chapter06/libcap.xml
index 202a4b3a4..62acae35d 100644
--- a/chapter06/libcap.xml
+++ b/chapter06/libcap.xml
@@ -91,7 +91,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libcap.so) /usr/lib/libcap.so</userinput><
 
       <seglistitem>
         <seg>capsh, getcap, getpcaps, and setcap</seg>
-        <seg>libcap.{a,so}</seg>
+        <seg>libcap.so</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 5ad81b563..385df3752 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -75,7 +75,7 @@
 
       <seglistitem>
         <seg>libtool and libtoolize</seg>
-        <seg>libltdl.{a,so}</seg>
+        <seg>libltdl.so</seg>
         <seg>/usr/include/libltdl and /usr/share/libtool</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index d876a8f3d..4e81cc998 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -283,9 +283,9 @@
 
       <seglistitem>
         <seg>accessdb, apropos (link to whatis), catman, lexgrog, man, mandb,
-        manpath, whatis, and zsoelim</seg>
+        manpath, and whatis</seg>
         <seg>libman.so and libmandb.so</seg>
-        <seg>/usr/lib/man-db, /usr/libexec/man-db,
+        <seg>/usr/lib/man-db, /usr/lib/tmpfiles.d, /usr/libexec/man-db,
         and /usr/share/doc/man-db-&man-db-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -383,18 +383,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="zsoelim">
-        <term><command>zsoelim</command></term>
-        <listitem>
-          <para>Reads files and replaces lines of the form <emphasis>.so
-          file</emphasis> by the contents of the mentioned
-          <emphasis>file</emphasis></para>
-          <indexterm zone="ch-system-man-db zsoelim">
-            <primary sortas="b-zsoelim">zsoelim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libman">
         <term><filename class="libraryfile">libman</filename></term>
         <listitem>
diff --git a/chapter06/mpc.xml b/chapter06/mpc.xml
index cac9cc7fa..2d518c8c1 100644
--- a/chapter06/mpc.xml
+++ b/chapter06/mpc.xml
@@ -73,7 +73,7 @@ make install-html</userinput></screen>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>libmpc.{a,so}</seg>
+        <seg>libmpc.so</seg>
         <seg>/usr/share/doc/mpc-&mpc-version;</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml
index 8da91cb47..582e76bbe 100644
--- a/chapter06/mpfr.xml
+++ b/chapter06/mpfr.xml
@@ -83,7 +83,7 @@ make install-html</userinput></screen>
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>libmpfr.{a,so}</seg>
+        <seg>libmpfr.so</seg>
         <seg>/usr/share/doc/mpfr-&mpfr-version;</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index e037f6a04..9e4e1dc4b 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -174,7 +174,7 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
            clear, 
            infocmp, 
            infotocap (link to tic),
-           ncursesw5-config, 
+           ncursesw6-config, 
            reset (link to tset), 
            tabs, 
            tic, 
@@ -187,6 +187,7 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
            libformw.so, 
            libmenuw.so, 
            libncursesw.so,
+           libncurses++w.a,
            libpanelw.so, and their non-wide-character counterparts without "w"
               in the library names.</seg>
         <seg>
@@ -242,12 +243,12 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="ncursesw5-config">
-        <term><command>ncursesw5-config</command></term>
+      <varlistentry id="ncursesw6-config">
+        <term><command>ncursesw6-config</command></term>
         <listitem>
           <para>Provides configuration information for ncurses</para>
-          <indexterm zone="ch-system-ncurses ncursesw5-config">
-            <primary sortas="b-ncursesw5-config">ncursesw5-config</primary>
+          <indexterm zone="ch-system-ncurses ncursesw6-config">
+            <primary sortas="b-ncursesw5-config">ncursesw6-config</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 1085712b5..5922e44fc 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -135,14 +135,13 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>a2p, c2ph, corelist, cpan, cpan2dist, cpanp,
-        cpanp-run-perl, enc2xs, find2perl, h2ph, h2xs,
-        instmodsh, json_pp, libnetcfg, perl, perl&perl-version; (link to perl),
-        perlbug, perldoc, perlivp, perlthanks (link to perlbug), piconv, pl2pm,
-        pod2html, pod2latex, pod2man, pod2text, pod2usage, podchecker,
-        podselect, prove, psed (link to s2p), pstruct (link to c2ph), ptar,
-        ptardiff, ptargrep, s2p, shasum, splain, xsubpp, and zipdetails</seg>
-        <seg>Several hundred which cannot all be listed here</seg>
+        <seg>c2ph, corelist, cpan, enc2xs, encguess, h2ph, h2xs, instmodsh,
+        json_pp, libnetcfg, perl, perl&perl-version; (hard link to perl),
+        perlbug, perldoc, perlivp, perlthanks (hard link to perlbug), piconv,
+        pl2pm, pod2html, pod2man, pod2text, pod2usage, podchecker, podselect,
+        prove, pstruct (hard link to c2ph), ptar, ptardiff, ptargrep, shasum,
+        splain, xsubpp, and zipdetails</seg>
+        <seg>Many which cannot all be listed here</seg>
         <seg>/usr/lib/perl5</seg>
       </seglistitem>
     </segmentedlist>
@@ -236,6 +235,16 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="encguess">
+        <term><command>encguess</command></term>
+        <listitem>
+          <para>Guess the encoding type of one or several files</para>
+          <indexterm zone="ch-system-perl encguess">
+            <primary sortas="b-encguess">encguess</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="find2perl">
         <term><command>find2perl</command></term>
         <listitem>
@@ -472,16 +481,6 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="psed">
-        <term><command>psed</command></term>
-        <listitem>
-          <para>A Perl version of the stream editor <command>sed</command></para>
-          <indexterm zone="ch-system-perl psed">
-            <primary sortas="b-psed">psed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="pstruct">
         <term><command>pstruct</command></term>
         <listitem>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 71c0e0b04..1fe0bba16 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -47,7 +47,8 @@
             --libdir=/usr/lib                        \
             --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
             --disable-static                         \
-            --disable-kill</userinput></screen>
+            --disable-kill                           \
+            --with-systemd</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 5ddbdf9df..3b162d5ea 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -105,7 +105,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.so</us
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>libhistory.{a,so} and libreadline.{a,so}</seg>
+        <seg>libhistory.so and libreadline.so</seg>
         <seg>/usr/include/readline, /usr/share/readline, and
         /usr/share/doc/readline-&readline-version;</seg>
       </seglistitem>
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index 25332ba0e..40c69c6be 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -46,12 +46,11 @@
   libraries are from binutils, bzip2, e2fsprogs, <!--flex,--> libtool, and zlib.  If desired,
   remove them now:</para>
 
-<screen><userinput>rm /usr/lib/lib{bfd,opcodes}.a
-rm /usr/lib/libbz2.a
-rm /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
-<!--rm /usr/lib/lib{fl,fl_pic}.a
--->rm /usr/lib/libltdl.a
-rm /usr/lib/libz.a</userinput></screen>
+<screen><userinput>rm -f /usr/lib/lib{bfd,opcodes}.a
+rm -f /usr/lib/libbz2.a
+rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
+rm -f /usr/lib/libltdl.a
+rm -f /usr/lib/libz.a</userinput></screen>
 
 <!-- Flex shared library is broken. Keep static until next flex release. -->
 
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 625b313e4..38d2dc345 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -147,7 +147,7 @@ ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> -->
     a group of the same name as the user. By default the user ID (UID) and
     group ID (GID) numbers will begin with 1000. This means if you don't pass
     parameters to <command>useradd</command>, each user will be a member of a
-    unique group on the system. If this behaviour is undesirable, you'll need
+    unique group on the system. If this behavior is undesirable, you'll need
     to pass the <parameter>-g</parameter> parameter to
     <command>useradd</command>. The default parameters are stored in the
     <filename>/etc/default/useradd</filename> file. You may need to modify two
@@ -211,9 +211,9 @@ ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> -->
       <seglistitem>
         <seg>chage, chfn, chgpasswd, chpasswd, chsh, expiry, faillog, gpasswd,
         groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
-        lastlog, login, logoutd, newgrp, newusers, nologin, passwd, pwck,
-        pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
-        vigr (link to vipw), and vipw</seg>
+        lastlog, login, logoutd, newgidmap, newgrp,newuidmap,  newusers,
+        nologin, passwd, pwck, pwconv, pwunconv, sg (link to newgrp), su,
+        useradd, userdel, usermod, vigr (link to vipw), and vipw</seg>
         <seg>/etc/default</seg>
       </seglistitem>
     </segmentedlist>
@@ -414,6 +414,16 @@ ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> -->
         </listitem>
       </varlistentry>
 
+      <varlistentry id="newgidmap">
+        <term><command>newgidmap</command></term>
+        <listitem>
+          <para>Is used to set the gid mapping of a user namespace</para>
+          <indexterm zone="ch-system-shadow newgidmap">
+            <primary sortas="b-newgidmap">newgidmap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="newgrp">
         <term><command>newgrp</command></term>
         <listitem>
@@ -424,6 +434,16 @@ ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> -->
         </listitem>
       </varlistentry>
 
+      <varlistentry id="newuidmap">
+        <term><command>newuidmap</command></term>
+        <listitem>
+          <para>Is used to set the uid mapping of a user namespace</para>
+          <indexterm zone="ch-system-shadow newuidmap">
+            <primary sortas="b-newuidmap">newuidmap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="newusers">
         <term><command>newusers</command></term>
         <listitem>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 8a86cb385..7a2f821ea 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -41,7 +41,8 @@
     <title>Installation of systemd</title>
 
     <para>First, create a file to allow systemd to build when using Util-Linux
-    built in Chapter 5 and disable LTO by default:</para>
+    built in Chapter 5, to disable LTO by default, and to build without
+    xlstproc:</para>
 
 <screen><userinput remap="pre">cat &gt; config.cache &lt;&lt; "EOF"
 <literal>KILL=/bin/kill
@@ -53,7 +54,8 @@ BLKID_CFLAGS="-I/tools/include/blkid"
 HAVE_LIBMOUNT=1
 MOUNT_LIBS="-lmount"
 MOUNT_CFLAGS="-I/tools/include/libmount"
-cc_cv_CFLAGS__flto=no</literal>
+cc_cv_CFLAGS__flto=no
+XSLTPROC="/usr/bin/xsltproc"</literal>
 EOF</userinput></screen>
 
     <para>LTO is disabled by default because it causes <command>systemd</command>
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index ee69bad86..eb9d3d980 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -76,11 +76,6 @@
 
 <screen><userinput remap="install">make install
 make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
-<!--
-    <para>Finally, generate the man page and place it in the proper location:</para>
-
-<screen><userinput remap="install">perl tarman &gt; /usr/share/man/man1/tar.1</userinput></screen>
--->
   </sect2>
 
 
@@ -92,7 +87,7 @@ make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></sc
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>rmt and tar</seg>
+        <seg>tar</seg>
         <seg>/usr/share/doc/tar-&tar-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -102,17 +97,6 @@ make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></sc
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="rmt">
-        <term><command>rmt</command></term>
-        <listitem>
-          <para>Remotely manipulates a magnetic
-          tape drive through an interprocess communication connection</para>
-          <indexterm zone="ch-system-tar rmt">
-            <primary sortas="b-rmt">rmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="tar">
         <term><command>tar</command></term>
         <listitem>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index d94c049eb..c4308f337 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -101,7 +101,7 @@ popd</userinput></screen>
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>info, infokey, install-info, makeinfo (link to texi2any),
+        <seg>info, install-info, makeinfo (link to texi2any),
         pdftexi2dvi, pod2texi, texi2any, texi2dvi, texi2pdf, and texindex</seg>
         <seg>/usr/share/texinfo</seg>
       </seglistitem>
@@ -125,17 +125,6 @@ popd</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="infokey">
-        <term><command>infokey</command></term>
-        <listitem>
-          <para>Compiles a source file containing Info customizations into a
-          binary format</para>
-          <indexterm zone="ch-system-texinfo infokey">
-            <primary sortas="b-infokey">infokey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="install-info">
         <term><command>install-info</command></term>
         <listitem>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 00706794e..f1a27e8ee 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -121,18 +121,22 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
         fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump, hwclock,
         i386, ionice, ipcmk, ipcrm, ipcs, isosize, kill, last, lastb (link to
         last), ldattach, linux32, linux64, logger, look, losetup, lsblk, lscpu,
-        lslocks, lslogins, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
-        more, mount, mountpoint, namei, partx, pg, pivot_root, prlimit, raw,
+        lsipc, lslocks, lslogins, mcookie, mesg, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
+        more, mount, mountpoint, namei, nsenter, partx, pg, pivot_root, prlimit, raw,
         readprofile, rename, renice, resizepart, rev, rtcwake, script,
         scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
         swapoff (link to swapon), swapon, switch_root, tailf, taskset, ul,
-        umount, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis,
+        umount, uname26, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis,
         wipefs, x86_64, and zramctl</seg>
-        <seg>libblkid.{a,so}, libfdisk.{a,so}, libmount.{a,so}, 
-        libsmartcols.{a,so}, and libuuid.{a,so}</seg>
-        <seg>/etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount, 
-        /usr/include/uuid, /usr/share/doc/util-linux-&util-linux-version;/getopt, 
-        and /var/lib/hwclock</seg>
+        <seg>libblkid.so, libfdisk.so, libmount.so, 
+        libsmartcols.so, and libuuid.so</seg>
+        <seg>/usr/include/blkid,
+             /usr/include/libfdisk,
+             /usr/include/libmount,
+             /usr/include/libsmartcols,
+             /usr/include/uuid,
+             /usr/share/doc/util-linux-&util-linux-version;,
+         and /var/lib/hwclock</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -339,7 +343,7 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
       <varlistentry id="fdisk">
         <term><command>fdisk</command></term>
         <listitem>
-          <para>Manipulates the paritition table of the given device</para>
+          <para>Manipulates the partition table of the given device</para>
           <indexterm zone="ch-system-util-linux fdisk">
             <primary sortas="b-fdisk">fdisk</primary>
           </indexterm>
@@ -639,6 +643,17 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="lsipc">
+        <term><command>lsipc</command></term>
+        <listitem>
+          <para>Prints information on IPC facilities currently employed
+          in the system</para>
+          <indexterm zone="ch-system-util-linux lsipc">
+            <primary sortas="b-lsipc">lsipc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="lslocks">
         <term><command>lslocks</command></term>
         <listitem>
@@ -1055,6 +1070,16 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="uname26">
+        <term><command>uname26</command></term>
+        <listitem>
+          <para>A symbolic link to setarch</para>
+          <indexterm zone="ch-system-util-linux uname26">
+            <primary sortas="b-uname26">uname26</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="unshare">
         <term><command>unshare</command></term>
         <listitem>
diff --git a/chapter06/xz.xml b/chapter06/xz.xml
index 8d29b578a..e566273e6 100644
--- a/chapter06/xz.xml
+++ b/chapter06/xz.xml
@@ -44,6 +44,13 @@
   <sect2 role="installation">
     <title>Installation of Xz</title>
 
+    <para>First, fix an internal problem:</para>
+
+<screen><userinput remap="pre">sed -e '/mf\.buffer = NULL/a next->coder->mf.size = 0;' \
+     -i src/liblzma/lz/lz_encoder.c</userinput></screen>
+
+
+
     <para>Prepare Xz for compilation with:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr    \
diff --git a/chapter07/console.xml b/chapter07/console.xml
index 175ff7c5a..ea1062c23 100644
--- a/chapter07/console.xml
+++ b/chapter07/console.xml
@@ -68,7 +68,7 @@
     <varlistentry>
       <term>FONT_UNIMAP</term>
       <listitem>
-        <para>This variable specifies the unicode font map.</para>
+        <para>This variable specifies the Unicode font map.</para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 141715e8b..7dc86cbf5 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -22,21 +22,24 @@
 
     <para>Starting with version 209, systemd ships a network configuration
     daemon called <command>systemd-networkd</command> which can be used for
-    basic network configuration.</para>
-
-    <para>Configuration files for <command>systemd-networkd</command> can be
-    placed in <filename class="directory">/usr/lib/systemd/network</filename>
-    or <filename class="directory">/etc/systemd/network</filename>. Note that
-    files in <filename class="directory">/etc/systemd/network</filename> have
+    basic network configuration. Additionally, since version 213, DNS name
+    resolution can be handled by <command>systemd-resolved</command> in place
+    of a static <filename>/etc/resolv.conf</filename> file. Both services are
+    enabled by defualt, and absolutely should not be disabled.</para>
+
+    <para>Configuration files for <command>systemd-networkd</command> (and
+    <command>systemd-resolved</command>) can be placed in
+    <filename class="directory">/usr/lib/systemd/network</filename>
+    or <filename class="directory">/etc/systemd/network</filename>. Files in
+    <filename class="directory">/etc/systemd/network</filename> have a
     higher priority than the ones in
-    <filename class="directory">/usr/lib/systemd/network</filename>.</para>
-
-    <para>There are three types of configuration files:
+    <filename class="directory">/usr/lib/systemd/network</filename>.
+    There are three types of configuration files:
     <filename class="extension">.link</filename>,
     <filename class="extension">.netdev</filename> and
     <filename class="extension">.network</filename> files. For detailed
-    explanation about contents of the mentioned
-    configuration files, consult <filename>systemd-link(5)</filename>,
+    descriptions and example contents of these configuration files, consult 
+    the <filename>systemd-link(5)</filename>,
     <filename>systemd-netdev(5)</filename> and
     <filename>systemd-network(5)</filename> manual pages.</para>
 
@@ -49,10 +52,11 @@
     <sect3 id="systemd-networkd-static">
       <title>Static IP Configuration</title>
 
-      <para>The command below creates a basic configuration file for
-      Static IP setup:</para>
+      <para>The command below creates a basic configuration file for a
+      Static IP setup (using both systemd-networkd and
+      systemd-resolved):</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/systemd/network/10-static-eth0.network &lt;&lt; "EOF"
+<screen role="nodump"><userinput>cat &gt; /etc/systemd/network/10-eth0-static.network &lt;&lt; "EOF"
 <literal>[Match]
 Name=eth0
 
@@ -62,27 +66,25 @@ Gateway=192.168.0.1
 DNS=192.168.0.1</literal>
 EOF</userinput></screen>
 
-      <para>More than one DNS entry can be specified in the configuration file.</para>
+      <para>Multiple DNS entries can be added if you have more than one DNS
+      server.</para>
 
     </sect3>
 
     <sect3 id="systemd-networkd-dhcp">
       <title>DHCP Configuration</title>
 
-      <para>The command below creates a basic configuration file for
+      <para>The command below creates a basic configuration file for an IPv4
       DHCP setup:</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/systemd/network/10-dhcp-eth0.network &lt;&lt; "EOF"
+<screen role="nodump"><userinput>cat &gt; /etc/systemd/network/10-eth0-dhcp.network &lt;&lt; "EOF"
 <literal>[Match]
 Name=eth0
 
 [Network]
-DHCP=yes</literal>
+DHCP=ipv4</literal>
 EOF</userinput></screen>
 
-      <para>Note that <command>systemd-networkd</command> can only handle
-      DHCPv4. DHCPv6 support is a work in progress.</para>
-
     </sect3>
 
   </sect2>
@@ -101,8 +103,36 @@ EOF</userinput></screen>
     from the ISP or network administrator, into
     <filename>/etc/resolv.conf</filename>.</para>
 
-    <para>If static <filename>/etc/resolv.conf</filename> is desired, create
-    it by running the following command:</para>
+    <sect3 id="resolv-conf-systemd-resoloved">
+      <title>systemd-resolved Configuration</title>
+
+      <note><para>If using another means to configure your network
+      interfaces (ex: ppp, network-manager, etc.), or if using any type of
+      local resolver (ex: bind, dnsmasq, etc.), or any other software that
+      generates an <filename>/etc/resolv.conf</filename> (ex: resolvconf), the
+      <command>systemd-resolved</command> service should not be
+      used.</para></note>
+
+      <para>When using <command>systemd-resolved</command> for DNS
+      configuration, it is responsible for creating the
+      <filename>/etc/resolv.conf</filename> file, which is placed in a
+      non-standard location that is writable during early boot. In order to be
+      used by other components of the system, it is necessary to create a
+      symlink with the following command:</para>
+
+<screen><userinput>ln -sfv /run/systemd/resolve/resolv.conf /etc/resolv.conf</userinput></screen>
+
+      <para>This is required if you are specifying DNS entries in <filename
+      class="extension">.network</filename> files or using the built in
+      DHCP client to obtain DNS addresses.</para>
+
+    </sect3>
+
+    <sect3 id="resolv-conf-static">
+      <title>Static resolv.conf Configuration</title>
+
+      <para>If a static <filename>/etc/resolv.conf</filename> is desired,
+      create it by running the following command:</para>
 
 <screen role="nodump"><userinput>cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
 <literal># Begin /etc/resolv.conf
@@ -114,31 +144,24 @@ nameserver <replaceable>&lt;IP address of your secondary nameserver&gt;</replace
 # End /etc/resolv.conf</literal>
 EOF</userinput></screen>
 
-    <para>The <varname>domain</varname> statement can be omitted
-    or replaced with a <varname>search</varname> statement.  See the man page for
-    resolv.conf for more details.</para>
+      <para>The <varname>domain</varname> statement can be omitted
+      or replaced with a <varname>search</varname> statement.  See the man page
+      for resolv.conf for more details.</para>
 
-    <para>Replace <replaceable>&lt;IP address of the nameserver&gt;</replaceable>
-    with the IP address of the DNS most appropriate for the setup. There will
-    often be more than one entry (requirements demand secondary servers for
-    fallback capability). If you only need or want one DNS server, remove the
-    second <emphasis>nameserver</emphasis> line from the file. The IP address
-    may also be a router on the local network.</para>
+      <para>Replace
+      <replaceable>&lt;IP address of the nameserver&gt;</replaceable>
+      with the IP address of the DNS most appropriate for the setup. There will
+      often be more than one entry (requirements demand secondary servers for
+      fallback capability). If you only need or want one DNS server, remove the
+      second <emphasis>nameserver</emphasis> line from the file. The IP address
+      may also be a router on the local network.</para>
 
-    <note><para>The Google Public IPv4 DNS addresses are 8.8.8.8 and 8.8.4.4.</para></note>
+      <note><para>The Google Public IPv4 DNS addresses are
+      <parameter>8.8.8.8</parameter> and <parameter>8.8.4.4</parameter>
+      for IPv4, and <parameter>2001:4860:4860::8888</parameter> and
+      <parameter>2001:4860:4860::8844</parameter> for IPv6.</para></note>
 
-    <para>When using <command>systemd-networkd</command> for network
-    configuration, another daemon, <command>systemd-resolved</command>,
-    is responsible for creating the <filename>/etc/resolv.conf</filename>
-    file. It is, however, placed in a non-standard location which is
-    writable since early boot, so it is necessary to create a symlink
-    to it by running the following command:</para>
-
-<screen><userinput>ln -sfv /run/systemd/resolve/resolv.conf /etc/resolv.conf</userinput></screen>
-
-    <para>This is required if you are specifying DNS entries in <filename
-    class="extension">.network</filename> files or using the built in
-    DHCP client to obtain DNS addresses.</para>
+    </sect3>
 
   </sect2>
 
diff --git a/chapter07/udev.xml b/chapter07/udev.xml
index 8234c4cb7..548a2d2ee 100644
--- a/chapter07/udev.xml
+++ b/chapter07/udev.xml
@@ -254,7 +254,7 @@
       <title>Udev creates a device incorrectly, or makes a wrong symlink</title>
 
       <para>This usually happens if a rule unexpectedly matches a device. For
-      example, a poorly-writen rule can match both a SCSI disk (as desired)
+      example, a poorly-written rule can match both a SCSI disk (as desired)
       and the corresponding SCSI generic device (incorrectly) by vendor.
       Find the offending rule and make it more specific, with the help of the
       <command>udevadm info</command> command.</para>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 39626d001..8bc1423c8 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -105,7 +105,7 @@ File systems  ---&gt;
       <varlistentry>
         <term><parameter>Support for uevent helper</parameter></term>
         <listitem>
-          <para>Having this opion set may interfere with device
+          <para>Having this option set may interfere with device
           management when using Udev/Eudev. </para>
         </listitem>
       </varlistentry>
diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml
index 094a64ee5..8f2508ec8 100644
--- a/chapter09/reboot.xml
+++ b/chapter09/reboot.xml
@@ -45,7 +45,7 @@
     <listitem><para>If you want to access your new system from a remote system
     within a comfortable GUI environment, install <ulink
     url='&blfs-book;postlfs/openssh.html'>openssh</ulink> and its
-    prerequsite, <ulink
+    prerequisite, <ulink
     url='&blfs-book;postlfs/openssl.html'>openssl</ulink>.
     </para></listitem>
 
diff --git a/general.ent b/general.ent
index e0fe1f380..035abd429 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20150928-systemd">
+<!ENTITY version         "20151231-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "September 28th, 2015">
+<!ENTITY releasedate     "December 31st, 2015">
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.9">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
@@ -20,9 +20,7 @@
                          
 <!ENTITY lfs-ticket-root "http://wiki.linuxfromscratch.org/lfs/ticket/">
 
-<!ENTITY anduin          "http://anduin.linuxfromscratch.org/sources">
-<!ENTITY anduin-sources  "&anduin;/LFS/lfs-packages/conglomeration/">
-<!ENTITY anduin-other    "&anduin;/other/">
+<!ENTITY anduin-sources  "http://anduin.linuxfromscratch.org/LFS">
 
 <!ENTITY buildtime       "Approximate build time">
 <!ENTITY diskspace       "Required disk space">
diff --git a/packages.ent b/packages.ent
index dd2a76169..e8b938699 100644
--- a/packages.ent
+++ b/packages.ent
@@ -28,7 +28,7 @@
 <!ENTITY autoconf-md5 "50f97f4159805e374639a73e2636f22e">
 <!ENTITY autoconf-home "&gnu-software;autoconf/">
 <!ENTITY autoconf-ch6-du "18 MB">
-<!ENTITY autoconf-ch6-sbu "4.0 SBU">
+<!ENTITY autoconf-ch6-sbu "less than 0.1 SBU (about 4.7 SBU with tests)">
 
 <!ENTITY automake-version "1.15">
 <!ENTITY am-minor-version "1.15">
@@ -105,12 +105,12 @@
 <!ENTITY coreutils-ch6-du "166 MB">
 <!ENTITY coreutils-ch6-sbu "3.0 SBU">
 
-<!ENTITY dbus-version "1.8.20">
-<!ENTITY dbus-size "1,828 KB">
+<!ENTITY dbus-version "1.10.6">
+<!ENTITY dbus-size "1,908 KB">
 <!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-<!ENTITY dbus-md5 "b49890bbabedab3a1c3f4f73c7ff8b2b">
+<!ENTITY dbus-md5 "26d0cf3a1c9782cb0e342101f0450440">
 <!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
-<!ENTITY dbus-ch6-du "35 MB">
+<!ENTITY dbus-ch6-du "36 MB">
 <!ENTITY dbus-ch6-sbu "0.3 SBU">
 
 <!ENTITY dejagnu-version "1.5.3">
@@ -159,30 +159,30 @@
 <!ENTITY expect-ch5-du "4.4 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 
-<!ENTITY file-version "5.24">
-<!ENTITY file-size "721 KB">
+<!ENTITY file-version "5.25">
+<!ENTITY file-size "723 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "ec161b5a0d2aef147fb046e5630b1408">
+<!ENTITY file-md5 "e6a972d4e10d9e76407a432f4a63cd4c">
 <!ENTITY file-home "http://www.darwinsys.com/file/">
 <!ENTITY file-ch5-du "14 MB">
 <!ENTITY file-ch5-sbu "0.1 SBU">
 <!ENTITY file-ch6-du "14 MB">
 <!ENTITY file-ch6-sbu "0.1 SBU">
 
-<!ENTITY findutils-version "4.4.2">
-<!ENTITY findutils-size "2,100 KB">
+<!ENTITY findutils-version "4.6.0">
+<!ENTITY findutils-size "3,692 KB">
 <!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.gz">
-<!ENTITY findutils-md5 "351cc4adb07d54877fa15f75fb77d39f">
+<!ENTITY findutils-md5 "9936aa8009438ce185bea2694a997fc1">
 <!ENTITY findutils-home "&gnu-software;findutils/">
 <!ENTITY findutils-ch5-du "26 MB">
 <!ENTITY findutils-ch5-sbu "0.2 SBU">
 <!ENTITY findutils-ch6-du "29 MB">
 <!ENTITY findutils-ch6-sbu "0.4 SBU">
 
-<!ENTITY flex-version "2.5.39">
-<!ENTITY flex-size "1,316 KB">
+<!ENTITY flex-version "2.6.0">
+<!ENTITY flex-size "1,338 KB">
 <!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.xz">
-<!ENTITY flex-md5 "477679c37ff8b28248a9b05f1da29a82">
+<!ENTITY flex-md5 "3cbbfa1554d0b75fad9f8100732454de">
 <!ENTITY flex-home "http://flex.sourceforge.net">
 <!ENTITY flex-ch6-du "38 MB">
 <!ENTITY flex-ch6-sbu "0.4 SBU">
@@ -197,10 +197,10 @@
 <!ENTITY gawk-ch6-du "36 MB">
 <!ENTITY gawk-ch6-sbu "0.3 SBU">
 
-<!ENTITY gcc-version "5.2.0">
-<!ENTITY gcc-size "92,990 KB">
+<!ENTITY gcc-version "5.3.0">
+<!ENTITY gcc-size "93,205 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "a51bcfeb3da7dd4c623e27207ed43467">
+<!ENTITY gcc-md5 "c9616fd448f980259c31de613e575719">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "2.5 GB">
 <!ENTITY gcc-ch5p1-sbu "9.3 SBU">
@@ -220,10 +220,10 @@
 <!ENTITY gdbm-ch6-du "9.0 MB">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 
-<!ENTITY gettext-version "0.19.5.1">
-<!ENTITY gettext-size "6,713 KB">
+<!ENTITY gettext-version "0.19.7">
+<!ENTITY gettext-size "7,019 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "9b7c37e410df4bd1bf854e8c897cf937">
+<!ENTITY gettext-md5 "f81e50556da41b44c1d59ac93474dca5">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "153 MB">
 <!ENTITY gettext-ch5-sbu "0.9 SBU">
@@ -240,11 +240,11 @@
 <!ENTITY glibc-ch6-du "1.2 GB">
 <!ENTITY glibc-ch6-sbu "20.7 SBU">
 
-<!ENTITY gmp-version "6.0.0a">
-<!ENTITY gmp-extracted-version "6.0.0">
-<!ENTITY gmp-size "1,860 KB">
-<!ENTITY gmp-url "&gnu;/gmp/gmp-&gmp-version;.tar.xz">
-<!ENTITY gmp-md5 "1e6da4e434553d2811437aa42c7f7c76">
+<!ENTITY gmp-version "6.1.0">
+<!ENTITY gmp-extracted-version "6.1.0">
+<!ENTITY gmp-size "1,905 KB">
+<!ENTITY gmp-url "&gnu;gmp/gmp-&gmp-version;.tar.xz">
+<!ENTITY gmp-md5 "a9868ef2556ad6a2909babcd1428f3c7">
 <!ENTITY gmp-home "&gnu-software;gmp/">
 <!ENTITY gmp-ch6-du "57 MB">
 <!ENTITY gmp-ch6-sbu "1.3 SBU">
@@ -257,10 +257,10 @@
 <!ENTITY gperf-ch6-du "6.0 MB">
 <!ENTITY gperf-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY grep-version "2.21">
-<!ENTITY grep-size "1,232 KB">
+<!ENTITY grep-version "2.22">
+<!ENTITY grep-size "1,268 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "43c48064d6409862b8a850db83c8038a">
+<!ENTITY grep-md5 "e1015e951a49a82b02e38891026ef5df">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-ch5-du "19 MB">
 <!ENTITY grep-ch5-sbu "0.2 SBU">
@@ -295,7 +295,7 @@
 
 <!ENTITY iana-etc-version "2.30">
 <!ENTITY iana-etc-size "201 KB">
-<!ENTITY iana-etc-url "&anduin-sources;iana-etc/iana-etc-&iana-etc-version;.tar.bz2">
+<!ENTITY iana-etc-url "&anduin-sources;/iana-etc-&iana-etc-version;.tar.bz2">
 <!ENTITY iana-etc-md5 "3ba3afb1d1b261383d247f46cb135ee8">
 <!ENTITY iana-etc-home "http://freecode.com/projects/iana-etc">
 <!ENTITY iana-etc-ch6-du "2.2 MB">
@@ -317,10 +317,10 @@
 <!ENTITY intltool-ch6-du "1.2 MB">
 <!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY iproute2-version "4.2.0">
-<!ENTITY iproute2-size "485 KB">
+<!ENTITY iproute2-version "4.3.0">
+<!ENTITY iproute2-size "514 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "51c54cc3245eff451154938fbc0f64f5">
+<!ENTITY iproute2-md5 "1a2bbb80cfc7ab3f3e987e18b3207c2f">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "10 MB">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
@@ -333,18 +333,18 @@
 <!ENTITY kbd-ch6-du "30 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
 
-<!ENTITY kmod-version "21">
-<!ENTITY kmod-size "436 KB">
+<!ENTITY kmod-version "22">
+<!ENTITY kmod-size "440 KB">
 <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
-<!ENTITY kmod-md5 "ee246fab2e1cba9fbdcad6a86ec31531">
+<!ENTITY kmod-md5 "4371b847f3fbfaa4e9aa890ad616748f">
 <!ENTITY kmod-home " ">
 <!ENTITY kmod-ch6-du "11 MB">
 <!ENTITY kmod-ch6-sbu "0.1 SBU">
 
-<!ENTITY less-version "458">
-<!ENTITY less-size "308 KB">
+<!ENTITY less-version "481">
+<!ENTITY less-size "310 KB">
 <!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
-<!ENTITY less-md5 "935b38aa2e73c888c210dedf8fd94f49">
+<!ENTITY less-md5 "50ef46065c65257141a7340123527767">
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less/">
 <!ENTITY less-ch6-du "3.6 MB">
 <!ENTITY less-ch6-sbu "0.1 SBU">
@@ -374,13 +374,13 @@
 <!ENTITY libtool-ch6-sbu "2.3 SBU">
 
 <!ENTITY linux-major-version "4">
-<!ENTITY linux-minor-version "2">
-<!ENTITY linux-patch-version "0">
-<!-- <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> -->
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
-<!ENTITY linux-size "81,083 KB">
+<!ENTITY linux-minor-version "3">
+<!ENTITY linux-patch-version "3">
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
+<!ENTITY linux-size "84,888 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "3d5ea06d767e2f35c999eeadafc76523">
+<!ENTITY linux-md5 "f3068333fa524ff98914cf751d0b5710">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -413,18 +413,18 @@
 <!ENTITY make-ch6-du "12.4 MB">
 <!ENTITY make-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-db-version "2.7.2">
-<!ENTITY man-db-size "1,467 KB">
+<!ENTITY man-db-version "2.7.5">
+<!ENTITY man-db-size "1,471 KB">
 <!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz">
-<!ENTITY man-db-md5 "4b9480e4f1da04abb22ae7a9345ace6b">
+<!ENTITY man-db-md5 "37da0bb0400cc7b640f33c26f6052202">
 <!ENTITY man-db-home "http://www.nongnu.org/man-db/">
 <!ENTITY man-db-ch6-du "31 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-pages-version "4.02">
-<!ENTITY man-pages-size "1,371 KB">
+<!ENTITY man-pages-version "4.03">
+<!ENTITY man-pages-size "1,379 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "6c5692af39eb5fe468a8bd1f110b0edd">
+<!ENTITY man-pages-md5 "3835788d4422b92ac565b4bd97d295f6">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "26 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
@@ -465,20 +465,20 @@
 <!ENTITY patch-ch6-du "11.4 MB">
 <!ENTITY patch-ch6-sbu "0.2 SBU">
 
-<!ENTITY perl-version "5.22.0">
-<!ENTITY perl-size "13,488 KB">
+<!ENTITY perl-version "5.22.1">
+<!ENTITY perl-size "13,376 KB">
 <!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
-<!ENTITY perl-md5 "f67b152160431b3180fb766bdc2d02e2">
+<!ENTITY perl-md5 "67242b9bd642b458bec884ed2a040910">
 <!ENTITY perl-home "http://www.perl.org/">
 <!ENTITY perl-ch5-du "241 MB">
 <!ENTITY perl-ch5-sbu "1.6 SBU">
 <!ENTITY perl-ch6-du "241 MB">
 <!ENTITY perl-ch6-sbu "6.9 SBU">
 
-<!ENTITY pkgconfig-version "0.28">
-<!ENTITY pkgconfig-size "1,892 KB">
+<!ENTITY pkgconfig-version "0.29">
+<!ENTITY pkgconfig-size "1,928 KB">
 <!ENTITY pkgconfig-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
-<!ENTITY pkgconfig-md5 "aa3c86e67551adc3ac865160e34a2a0d">
+<!ENTITY pkgconfig-md5 "77f27dce7ef88d0634d0d6f90e03a77f">
 <!ENTITY pkgconfig-home "http://www.freedesktop.org/wiki/Software/pkg-config">
 <!ENTITY pkgconfig-ch6-du "30 MB">
 <!ENTITY pkgconfig-ch6-sbu "0.4 SBU">
@@ -525,12 +525,12 @@
 <!ENTITY shadow-ch6-du "43 MB">
 <!ENTITY shadow-ch6-sbu "0.2 SBU">
 
-<!ENTITY systemd-version "224">
-<!ENTITY systemd-size    "3,516 KB">
+<!ENTITY systemd-version "228">
+<!ENTITY systemd-size    "3,280 KB">
 <!ENTITY systemd-url     "http://anduin.linuxfromscratch.org/sources/other/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "814d12807f2449fb12dbb6d33a51cce8">
+<!ENTITY systemd-md5     "24143759335e05ac462942baec6413ff">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-ch6-du  "977 MB">
+<!ENTITY systemd-ch6-du  "990 MB">
 <!ENTITY systemd-ch6-sbu "5.3 SBU">
 
 <!ENTITY tar-version "1.28">
@@ -562,16 +562,16 @@
 <!ENTITY texinfo-ch6-du "106 MB">
 <!ENTITY texinfo-ch6-sbu "0.7 SBU">
 
-<!ENTITY tzdata-version "2015f">
-<!ENTITY tzdata-size "292 KB">
+<!ENTITY tzdata-version "2015g">
+<!ENTITY tzdata-size "294 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "e3b82732d20e973e48af1c6f13df9a1d">
+<!ENTITY tzdata-md5 "8d46e8b225b9a04c75f5c39636435ad6">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 
-<!ENTITY util-linux-version "2.27">
-<!ENTITY util-linux-size "3,774 KB">
+<!ENTITY util-linux-version "2.27.1">
+<!ENTITY util-linux-size "3,872 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.27/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "5b06bbda9309624ee7add15bc8d8ca22">
+<!ENTITY util-linux-md5 "3cd2698d1363a2c64091c2dadc974647">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-ch5-du "120 MB">
 <!ENTITY util-linux-ch5-sbu "0.8 SBU">
@@ -595,10 +595,10 @@
 <!ENTITY xml-parser-ch6-du "2.0 MB">
 <!ENTITY xml-parser-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY xz-version "5.2.1">
-<!ENTITY xz-size "987 KB">
+<!ENTITY xz-version "5.2.2">
+<!ENTITY xz-size "993 KB">
 <!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.xz">
-<!ENTITY xz-md5 "b5e2dd95dc8498cea5354377ed89aa65">
+<!ENTITY xz-md5 "e26772b69940085c0632589ab1d52e64">
 <!ENTITY xz-home "http://tukaani.org/xz">
 <!ENTITY xz-ch5-du "17.7 MB">
 <!ENTITY xz-ch5-sbu "0.3 SBU">
diff --git a/patches.ent b/patches.ent
index 813f73ac0..9872ef28d 100644
--- a/patches.ent
+++ b/patches.ent
@@ -22,6 +22,10 @@
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
 
+<!ENTITY glibc-largefile-patch "glibc-&glibc-version;-largefile-1.patch">
+<!ENTITY glibc-largefile-patch-md5 "203fe9133e82f2b59969c116b70fd84e">
+<!ENTITY glibc-largefile-patch-size "2.3 KB">
+
 <!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_i386_fix-1.patch">
 <!ENTITY glibc-upstream-patch-md5 "cfb3cb46074a833ac5729be79e4f2592">
 <!ENTITY glibc-upstream-patch-size "1.9 KB">
@@ -38,6 +42,6 @@
 <!ENTITY readline-fixes-patch-md5 "6b0d9f4e79319d56a7fee9b35e5cfd1b">
 <!ENTITY readline-fixes-patch-size "8 KB">
 
-<!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-3.patch">
-<!ENTITY systemd-compat-patch-md5 "5ef7a63335bd572dac54ac460caaebeb">
+<!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
+<!ENTITY systemd-compat-patch-md5 "13c4c53e12c1ad008a1304fa2b4c70c0">
 <!ENTITY systemd-compat-patch-size "12 KB">
diff --git a/pdf-fixups.sh b/pdf-fixups.sh
index 0efe57ccd..239090141 100755
--- a/pdf-fixups.sh
+++ b/pdf-fixups.sh
@@ -14,3 +14,5 @@ LINE=$(( LINE - 1 ))
 # Not needed
 #sed -i -e "$LINE s/monospace/&\" font-size=\"9pt/" $FILE
 
+# Break a block of code at the right place
+sed -i -e 's@gcc --version@<fo:block page-break-before="always"></fo:block>&@' $FILE
diff --git a/prologue/architecture.xml b/prologue/architecture.xml
index 84bcc3bb7..1a7ad8ab5 100644
--- a/prologue/architecture.xml
+++ b/prologue/architecture.xml
@@ -44,6 +44,7 @@ instructions needed for a straightforward base Linux system.  You can refer to
 the <ulink url="http://trac.clfs.org/">Cross Linux From Scratch</ulink>
 project for this advanced topic.</para>
 
+<!-- This does not appear to be valid for LFS/BLFS any more
 <para>There is one last comment about 64-bit systems. There are some older
 packages that cannot currently be built in a "pure" 64-bit system or require
 specialized build instructions. Generally, these packages have some embedded
@@ -53,6 +54,7 @@ specialized build instructions. Generally, these packages have some embedded
 http://xorg.freedesktop.org/releases/individual/driver/</ulink>. Many of these
 problems can be worked around, but may require some specialized procedures or
 patches.</para>
+-->
 
 </sect1>
 
diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml
index 39ecac34c..e2358ecf6 100644
--- a/prologue/hostreqs.xml
+++ b/prologue/hostreqs.xml
@@ -61,7 +61,7 @@
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">GCC-4.1.2</emphasis> including the C++
+      <para><emphasis role="strong">GCC-4.7</emphasis> including the C++
       compiler, <command>g++</command> (Versions greater than &gcc-version; are
       not recommended as they have not been tested)</para>
 
@@ -163,7 +163,11 @@
 # Simple script to list version numbers of critical development tools
 export LC_ALL=C
 bash --version | head -n1 | cut -d" " -f2-4
-echo "/bin/sh -&gt; `readlink -f /bin/sh`"
+MYSH=$(readlink -f /bin/sh)
+echo "/bin/sh -&gt; $MYSH"
+echo $MYSH | grep -q bash || echo "ERROR: /bin/sh does not point to bash"
+unset MYSH
+
 echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
 bison --version | head -n1
 
@@ -203,7 +207,7 @@ sed --version | head -n1
 tar --version | head -n1
 makeinfo --version | head -n1
 xz --version | head -n1
-
+<?hard-pagebreak?>
 echo 'int main(){}' &gt; dummy.c &amp;&amp; g++ -o dummy dummy.c
 if [ -x dummy ]
   then echo "g++ compilation OK";
diff --git a/prologue/why.xml b/prologue/why.xml
index b86f2b151..757f07b32 100644
--- a/prologue/why.xml
+++ b/prologue/why.xml
@@ -462,7 +462,7 @@
         <para>Systemd</para>
 
         <para>This package provides an <application>init</application> program
-        and several additional boot and system control capabilites as an
+        and several additional boot and system control capabilities as an
         alternative to Sysvinit. It is used by many Linux distributions.</para>
       </listitem>