Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter01/changelog.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -37,4 +37,281 @@
 -->
     <listitem>
+      <para>2014-06-14</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated to systemd-214.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Synchronized with LFS-SVN-20140611.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-06-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Several text changes.  Thanks to Chris
+          Staub for the patches.  Fixes
+           <ulink url="&lfs-ticket-root;3600">#3600</ulink>,
+           <ulink url="&lfs-ticket-root;3601">#3601</ulink>,
+           <ulink url="&lfs-ticket-root;3602">#3602</ulink>,
+           <ulink url="&lfs-ticket-root;3603">#3603</ulink>, and
+           <ulink url="&lfs-ticket-root;3604">#3604</ulink>,
+           </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-3.15.0. Fixes
+           <ulink url="&lfs-ticket-root;3608">#3608</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.15. Fixes
+           <ulink url="&lfs-ticket-root;3606">#3606</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Gettext-0.19.1. Fixes
+           <ulink url="&lfs-ticket-root;3599">#3599</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix test failure in e2fsprogs.  Fixes
+           <ulink url="&lfs-ticket-root;3586">#3586</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-06-08</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add SHLIB_LIBS to readline install command.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-06-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.42.10.  Fixes
+           <ulink url="&lfs-ticket-root;3586">#3596</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to grep-2.20.  Fixes
+           <ulink url="&lfs-ticket-root;3589">#3589</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to perl-5.20.0.  Fixes
+           <ulink url="&lfs-ticket-root;3592">#3592</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.68.  Fixes
+           <ulink url="&lfs-ticket-root;3593">#3593</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2014d.  Fixes
+           <ulink url="&lfs-ticket-root;3594">#3594</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to check-0.9.13.  Fixes
+           <ulink url="&lfs-ticket-root;3596">#3596</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.14.5.  Fixes
+           <ulink url="&lfs-ticket-root;3597">#3597</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to eudev-1.7.  Fixes
+           <ulink url="&lfs-ticket-root;3598">#3598</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-05-27</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.67.  Fixes
+           <ulink url="&lfs-ticket-root;3588">#3588</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Reformatted version check script to fit
+          pdf pages properly.  Fixes
+           <ulink url="&lfs-ticket-root;3590">#3590</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Added a note about adding the 
+          parent directory to the es and pt keymaps for proper
+          keymap loading.  Fixes
+           <ulink url="&lfs-ticket-root;3591">#3591</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-05-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove unneeded configure switches from gcc. Fixes
+           <ulink url="&lfs-ticket-root;3582">#3582</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-05-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Fix gcc LTO symlink for i686 systems.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix kbd-2.0.1.tar.gz md5sum. Fixes
+           <ulink url="&lfs-ticket-root;3581">#3581</ulink></para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix procps-ng url. Fixes
+           <ulink url="&lfs-ticket-root;3580">#3580</ulink></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-05-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2014c. Fixes
+          <ulink url="&lfs-ticket-root;3578">#3578</ulink></para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.14.4. Fixes
+           <ulink url="&lfs-ticket-root;3577">#3577</ulink></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-05-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update several URLs in Chapter 3. Fixes
+          <ulink url="&lfs-ticket-root;3570">#3570</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix typo in Chapter 5, libstdc++. Fixes
+          <ulink url="&lfs-ticket-root;3564">#3564</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Removed obsolete reference to acinstall
+          in automake section. Fixes
+          <ulink url="&lfs-ticket-root;3567">#3567</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Removed obsolete reference to sbu home page
+          in Chapter 4. Fixes
+          <ulink url="&lfs-ticket-root;3568">#3568</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update installed programs for gdbm.
+          Thanks to Chris Staub for the patch.  Fixes
+          <ulink url="&lfs-ticket-root;3560">#3560</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-04-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.14.2. Fixes
+          <ulink url="&lfs-ticket-root;3559">#3559</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-04-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove unneeded symlink in gcc-pass1. Fixes
+          <ulink url="&lfs-ticket-root;3555">#3555</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.24.2. Fixes
+          <ulink url="&lfs-ticket-root;3554">#3554</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-04-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gcc-4.9. Fixes
+          <ulink url="&lfs-ticket-root;3553">#3553</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-04-22</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Removed unneeded groff symlinks. Fixes
+          <ulink url="&lfs-ticket-root;3551">#3551</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update users so all acl tests pass. Fixes
+          <ulink url="&lfs-ticket-root;3548">#3548</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Fix a segfault in shuf program from
+          Coreutils. Fixes
+          <ulink url="&lfs-ticket-root;3550">#3550</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Fix a segfault in Acl package. Fixes
+          <ulink url="&lfs-ticket-root;3549">#3549</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-04-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Updated to linux-3.14.1. Fixes
+          <ulink url="&lfs-ticket-root;3545">#3545</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Updated to man-db-2.6.7.1. Fixes
+          <ulink url="&lfs-ticket-root;3543">#3543</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Updated to iproute2-3.14.0. Fixes
+          <ulink url="&lfs-ticket-root;3542">#3542</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Updated to gawk-4.1.1. Fixes
+          <ulink url="&lfs-ticket-root;3541">#3541</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Added mpfr upstream patch. Fixes
+          <ulink url="&lfs-ticket-root;3537">#3537</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Added readline upstream patch. Fixes
+          <ulink url="&lfs-ticket-root;3532">#3532</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Added bash upstream patch. Fixes
+          <ulink url="&lfs-ticket-root;3531">#3531</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Added bc patch to address memory leaks. Fixes
+          <ulink url="&lfs-ticket-root;3536">#3536</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-04-12</para>
       <itemizedlist>
@@ -49,5 +326,5 @@
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Change lex rwapper script to a symbolic 
+          <para>[bdubbs] - Change lex wrapper script to a symbolic 
           link. Completes 
           <ulink url="&lfs-ticket-root;3523">#3523</ulink>.</para>
Index: chapter01/how.xml
===================================================================
--- chapter01/how.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter01/how.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -12,5 +12,5 @@
 
   <para>The LFS system will be built by using an already installed
-  Linux distribution (such as Debian, Mandriva, Red Hat, or SUSE). This
+  Linux distribution (such as Debian, OpenMandriva, Fedora, or openSUSE). This
   existing Linux system (the host) will be used as a starting point to
   provide necessary programs, including a compiler, linker, and shell,
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter01/whatsnew.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -22,5 +22,4 @@
   <itemizedlist>
     <title>Upgraded to:</title>
-    <listitem><para></para></listitem>  <!-- satisfy build -->
     <!--<listitem>
     <para>None</para>
@@ -50,7 +49,7 @@
       <para>Bzip2 &bzip2-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Check &check-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Coreutils &coreutils-version;</para>
@@ -65,7 +64,7 @@
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Expat-&expat-version;</para>
@@ -83,16 +82,16 @@
       <para>Flex &flex-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Gawk &gawk-version;</para>
-    </listitem>-->
-    <!--<listitem>
+    </listitem>
+    <listitem>
       <para>GCC &gcc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GDBM &gdbm-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gettext &gettext-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Glibc &glibc-version;</para>
@@ -125,7 +124,7 @@
       <para>Intltool-&intltool-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>IPRoute2 &iproute2-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Kbd &kbd-version;</para>
@@ -158,7 +157,7 @@
       <para>Make &make-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Man-DB &man-db-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Man-pages &man-pages-version;</para>
@@ -176,7 +175,7 @@
       <para>Patch &patch-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Perl &perl-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Pkg-config &pkgconfig-version;</para>
@@ -194,10 +193,10 @@
       <para>Sed &sed-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Shadow &shadow-version;</para>
-    </listitem>-->
-    <!--<listitem>
+    </listitem>
+    <listitem>
       <para>Systemd &systemd-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Tar &tar-version;</para>
@@ -212,7 +211,7 @@
       <para>Tzdata &tzdata-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Util-Linux &util-linux-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Vim &vim-version;</para>
@@ -240,20 +239,29 @@
   <itemizedlist>
     <title>Added:</title>
-    <listitem><para></para></listitem>  <!-- satisfy build -->
-
+    <listitem>
+      <para>&bash-fixes-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&bc-memory-leak-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&binutils-lto-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&coreutils-shuf-segfault-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&mpfr-fixes-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&readline-fixes-patch;</para>
+    </listitem>
   </itemizedlist>
 
   <itemizedlist>
     <title>Removed:</title>
-    <listitem><para></para></listitem>  <!-- satisfy build -->
-
-    <listitem>
-      <para>bash-4.2-fixes-12.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>readline-6.2-fixes-2.patch</para>
-    </listitem>
-
+    <listitem>
+      <para>perl-5.18.2-libc-1.patch</para>
+    </listitem>
   </itemizedlist>
 
Index: chapter02/chapter02.xml
===================================================================
--- chapter02/chapter02.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter02/chapter02.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -16,4 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingfilesystem.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mounting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutlfs.xml"/>
 
 </chapter>
Index: chapter03/patches.xml
===================================================================
--- chapter03/patches.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter03/patches.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -18,5 +18,5 @@
 
   <variablelist role="materials">
-<!--
+
     <varlistentry>
       <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
@@ -26,5 +26,21 @@
       </listitem>
     </varlistentry>
--->
+
+    <varlistentry>
+      <term>Bc Memory Leak Patch - <token>&bc-memory-leak-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&bc-memory-leak-patch;"/></para>
+        <para>MD5 sum: <literal>&bc-memory-leak-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Binutils LTO Patch - <token>&binutils-lto-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&binutils-lto-patch;"/></para>
+        <para>MD5 sum: <literal>&binutils-lto-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
@@ -40,4 +56,28 @@
         <para>Download: <ulink url="&patches-root;&coreutils-i18n-patch;"/></para>
         <para>MD5 sum: <literal>&coreutils-i18n-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Coreutils shuf Segmentation Fault Fix Patch - <token>&coreutils-shuf-segfault-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&coreutils-shuf-segfault-patch;"/></para>
+        <para>MD5 sum: <literal>&coreutils-shuf-segfault-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>E2fsprogs Fix Test Patch - <token>&e2fsprogs-fix-test-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&e2fsprogs-fix-test-patch;"/></para>
+        <para>MD5 sum: <literal>&e2fsprogs-fix-test-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Gcc Upstream Patch - <token>&gcc-upstream-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gcc-upstream-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -60,8 +100,24 @@
 
     <varlistentry>
+      <term>Mpfr Upstream Fixes Patch - <token>&mpfr-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&mpfr-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&mpfr-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+<!--
+    <varlistentry>
       <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&perl-libc-patch;"/></para>
         <para>MD5 sum: <literal>&perl-libc-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+-->
+    <varlistentry>
+      <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: chapter04/aboutsbus.xml
===================================================================
--- chapter04/aboutsbus.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter04/aboutsbus.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -37,7 +37,4 @@
   numbers can vary by as much as dozens of minutes in some cases.</para>
 
-  <para>To view actual timings for a number of specific machines, we recommend
-  The LinuxFromScratch SBU Home Page at <ulink url="&lfs-root;~sbu/"/>.</para>
-
   <note><para>For many modern systems with multiple processors (or cores) the
   compilation time for a package can be reduced by performing a "parallel make"
Index: chapter04/chapter04.xml
===================================================================
--- chapter04/chapter04.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter04/chapter04.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -12,5 +12,6 @@
   <title>Final Preparations</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutlfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutlfs.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
Index: chapter04/settingenviron.xml
===================================================================
--- chapter04/settingenviron.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter04/settingenviron.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -71,10 +71,7 @@
   <para>The <envar>LC_ALL</envar> variable controls the localization of certain
   programs, making their messages follow the conventions of a specified country.
-  If the host system uses a version of Glibc older than 2.2.4, having
-  <envar>LC_ALL</envar> set to something other than <quote>POSIX</quote> or
-  <quote>C</quote> (during this chapter) may cause issues if you exit the chroot
-  environment and wish to return later. Setting <envar>LC_ALL</envar> to
-  <quote>POSIX</quote> or <quote>C</quote> (the two are equivalent) ensures that
-  everything will work as expected in the chroot environment.</para>
+  Setting <envar>LC_ALL</envar> to <quote>POSIX</quote> or <quote>C</quote>
+  (the two are equivalent) ensures that everything will work as expected in
+  the chroot environment.</para>
 
   <para>The <envar>LFS_TGT</envar> variable sets a non-default, but compatible machine
Index: chapter05/binutils-pass2.xml
===================================================================
--- chapter05/binutils-pass2.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter05/binutils-pass2.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -57,4 +57,5 @@
     --prefix=/tools            \
     --disable-nls              \
+    --disable-werror           \
     --with-lib-path=/tools/lib \
     --with-sysroot</userinput></screen>
Index: chapter05/gcc-pass1.xml
===================================================================
--- chapter05/gcc-pass1.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter05/gcc-pass1.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -130,13 +130,11 @@
     --disable-libgomp                                \
     --disable-libitm                                 \
-    --disable-libmudflap                             \
     --disable-libquadmath                            \
     --disable-libsanitizer                           \
     --disable-libssp                                 \
+    --disable-libvtv                                 \
+    --disable-libcilkrts                             \
     --disable-libstdc++-v3                           \
-    --enable-languages=c,c++                         \
-    --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
-    --with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
-
+    --enable-languages=c,c++</userinput></screen>
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -223,12 +221,4 @@
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>--with-mpfr-*</parameter></term>
-        <listitem>
-          <para>These options enable the build system to correctly use the
-          in-tree copy of the MPFR sources.</para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
@@ -246,6 +236,6 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
-
-    <para>Using <parameter>--disable-shared</parameter> means that the
+<!--
+    <para>Using <parameter>- -disable-shared</parameter> means that the
     <filename>libgcc_eh.a</filename> file isn't created and installed. The
     Glibc package depends on this library as it uses
@@ -256,5 +246,5 @@
 
 <screen><userinput remap="install">ln -sv libgcc.a `$LFS_TGT-gcc -print-libgcc-file-name | sed 's/libgcc/&amp;_eh/'`</userinput></screen>
-
+-->
   </sect2>
 
Index: chapter05/gcc-pass2.xml
===================================================================
--- chapter05/gcc-pass2.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter05/gcc-pass2.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -58,15 +58,13 @@
 <screen><userinput remap="pre">cat gcc/limitx.h gcc/glimits.h gcc/limity.h &gt; \
   `dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/include-fixed/limits.h</userinput></screen>
-
-    <para>For x86 machines, a bootstrap build of GCC uses the
-    <option>-fomit-frame-pointer</option> compiler flag.  Non-bootstrap builds
-    omit this flag by default, and the goal should be to produce a compiler
-    that is exactly the same as if it were bootstrapped.  Apply the following
-    <command>sed</command> command to force the build to use the flag:</para>
+<!--
+    <para>For x86 machines, the limited number of registers is a bottleneck
+    for the system.  Free one up by not using a frame pointer that is not
+    needed:</para>
 
 <screen><userinput remap="pre">case `uname -m` in
   i?86) sed -i 's/^T_CFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in ;;
 esac</userinput></screen>
-
+-->
     <para>Once again, change the location of GCC's default dynamic linker to
     use the one installed in <filename
@@ -124,7 +122,5 @@
     --disable-multilib                               \
     --disable-bootstrap                              \
-    --disable-libgomp                                \
-    --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
-    --with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
+    --disable-libgomp</userinput></screen>
 
     <variablelist>
Index: chapter05/libstdc++.xml
===================================================================
--- chapter05/libstdc++.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter05/libstdc++.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -94,5 +94,5 @@
 
       <varlistentry>
-        <term><parameter>--with-gxx-include-dir=/tools/include/c++/&gcc-version;</parameter></term>
+        <term><parameter>--with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</parameter></term>
         <listitem>
           <para>This is the location where the standard include files are
Index: chapter05/perl.xml
===================================================================
--- chapter05/perl.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter05/perl.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -43,13 +43,15 @@
   <sect2 role="installation">
     <title>Installation of Perl</title>
-
+<!--
     <para>First apply the following patch to adapt some hard-wired paths to the
     C library:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
-
+ 
+    Note: -Dlibs=-lm below avoids looking for gdbm and db libraries causing failure
+-->
     <para>Prepare Perl for compilation:</para>
 
-<screen><userinput remap="configure">sh Configure -des -Dprefix=/tools</userinput></screen>
+<screen><userinput remap="configure">sh Configure -des -Dprefix=/tools -Dlibs=-lm</userinput></screen>
 
     <para>Build the package:</para>
Index: chapter05/util-linux.xml
===================================================================
--- chapter05/util-linux.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter05/util-linux.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -19,4 +19,5 @@
   <indexterm zone="ch-tools-util-linux">
     <primary sortas="a-Util-linux">Util-linux</primary>
+    <secondary>tools</secondary>
   </indexterm>
 
Index: chapter06/acl.xml
===================================================================
--- chapter06/acl.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/acl.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -51,4 +51,10 @@
 
 <screen><userinput remap="pre">sed -i "s:| sed.*::g" test/{sbits-restore,cp,misc}.test</userinput></screen>
+
+    <para>Additionally, fix a bug that causes <command>getfacl -e</command>
+    to segfault on overly long group name:</para>
+
+<screen><userinput remap="pre">sed -i -e "/TABS-1;/a if (x > (TABS-1)) x = (TABS-1);" \
+    libacl/__acl_to_any_text.c</userinput></screen>
 
     <para>Prepare Acl for compilation:</para>
Index: chapter06/automake.xml
===================================================================
--- chapter06/automake.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/automake.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -74,5 +74,5 @@
 
       <seglistitem>
-        <seg>acinstall, aclocal, aclocal-&am-minor-version;, automake,
+        <seg>aclocal, aclocal-&am-minor-version;, automake,
         automake-&am-minor-version;, compile, config.guess, config.sub,
         depcomp, install-sh, mdate-sh, missing, mkinstalldirs,
@@ -87,14 +87,4 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="acinstall">
-        <term><command>acinstall</command></term>
-        <listitem>
-          <para>A script that installs aclocal-style M4 files</para>
-          <indexterm zone="ch-system-automake acinstall">
-            <primary sortas="b-acinstall">acinstall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
       <varlistentry id="aclocal">
Index: chapter06/bash.xml
===================================================================
--- chapter06/bash.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/bash.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -40,10 +40,10 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
-<!--
+
     <para>First, apply the following patch to fix various bugs that have been
     addressed upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
--->
+
     <para>Prepare Bash for compilation:</para>
 
Index: chapter06/bc.xml
===================================================================
--- chapter06/bc.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/bc.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -41,4 +41,8 @@
   <sect2 role="installation">
     <title>Installation of Bc</title>
+
+    <para>First, fix some minor memory leaks in the code:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&bc-memory-leak-patch;</userinput></screen> 
 
     <para>Prepare Bc for compilation:</para>
Index: chapter06/binutils.xml
===================================================================
--- chapter06/binutils.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/binutils.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -65,4 +65,9 @@
 sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
 
+    <para>Add an upstream patch to use gcc's link time optimization (LTO) 
+    the default:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-patch;</userinput></screen>
+
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
@@ -73,5 +78,7 @@
     <para>Prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr --enable-shared</userinput></screen>
+<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr  \
+                          --enable-shared \
+                          --disable-werror</userinput></screen>
 
     <para>Compile the package:</para>
@@ -110,15 +117,12 @@
 <screen><userinput remap="test">make check</userinput></screen>
 
+    <para>Six tests in the lto.exp testsuite are known to fail due
+    to changes in the most recent version of gcc.</para>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make tooldir=/usr install</userinput></screen>
-<!--
-    <para>Install the <filename class="headerfile">libiberty</filename> header
-    file that is needed by some packages:</para>
-
-<screen><userinput remap="install">cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen>
--->
+
   </sect2>
-
 
   <sect2 id="contents-binutils" role="content">
Index: chapter06/coreutils.xml
===================================================================
--- chapter06/coreutils.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/coreutils.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -41,9 +41,9 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
-<!--
-    <para>Fix a couple of test failures:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-test-patch;</userinput></screen>
--->
+
+    <para>First, fix a segfault in <command>shuf</command> program:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-shuf-segfault-patch;</userinput></screen>
+
     <para>POSIX requires that programs from Coreutils recognize character
     boundaries correctly even in multibyte locales. The following patch
Index: chapter06/createfiles.xml
===================================================================
--- chapter06/createfiles.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/createfiles.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -47,4 +47,87 @@
 ln -sv bash /bin/sh</userinput></screen>
 
+  <variablelist>
+    <title>The purpose of each link:</title>
+
+    <varlistentry>
+      <term><parameter><filename>/bin/bash</filename></parameter></term>
+      <listitem>
+        <para>Many <command>bash</command> scripts specify
+        <filename>/bin/bash</filename>.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter><filename>/bin/cat</filename></parameter></term>
+      <listitem>
+        <para>This pathname is hard-coded into Glibc's configure script.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter><filename>/bin/echo</filename></parameter></term>
+      <listitem>
+        <para>This is to satisfy one of the tests in Glibc's test suite, which
+        expects <filename>/bin/echo</filename>.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter><filename>/bin/pwd</filename></parameter></term>
+      <listitem>
+        <para>Some <command>configure</command> scripts, particularly Glibc's,
+        have this pathname hard-coded.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter><filename>/bin/stty</filename></parameter></term>
+      <listitem>
+        <para>This pathname is hard-coded into Expect, therefore it is needed
+        for Binutils and GCC test suites to pass.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter><filename>/usr/bin/perl</filename></parameter></term>
+      <listitem>
+        <para>Many Perl scripts hard-code this path to the
+        <command>perl</command> program.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter><filename>/usr/lib/libgcc_s.so{,.1}</filename></parameter></term>
+      <listitem>
+        <para>Glibc needs this for the pthreads library to work.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter><filename>/usr/lib/libstdc++{,.6}</filename></parameter></term>
+      <listitem>
+        <para>This is needed by several tests in Glibc's test suite, as well as
+        for C++ support in GMP.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter><filename>/usr/lib/libstdc++.la</filename></parameter></term>
+      <listitem>
+        <para>This prevents a <filename class="directory">/tools</filename>
+        reference that would otherwise be in
+        <filename>/usr/lib/libstdc++.la</filename> after GCC is installed.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter><filename>/bin/sh</filename></parameter></term>
+      <listitem>
+        <para>Many shell scripts hard-code <filename>/bin/sh</filename>.</para>
+      </listitem>
+    </varlistentry>
+
+  </variablelist>
+
   <para>Historically, Linux maintains a list of the mounted file systems in the
   file <filename>/etc/mtab</filename>. Modern kernels maintain this list
@@ -67,4 +150,5 @@
 <literal>root:x:0:0:root:/root:/bin/bash
 bin:x:1:1:bin:/dev/null:/bin/false
+daemon:x:6:6:Daemon User:/dev/null:/bin/false
 messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false
 nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
@@ -79,5 +163,5 @@
 <screen><userinput>cat &gt; /etc/group &lt;&lt; "EOF"
 <literal>root:x:0:
-bin:x:1:
+bin:x:1:daemon
 sys:x:2:
 kmem:x:3:
@@ -98,5 +182,6 @@
 systemd-journal:x:23:
 mail:x:34:
-nogroup:x:99:</literal>
+nogroup:x:99:
+users:x:999:</literal>
 EOF</userinput></screen>
 
@@ -104,5 +189,6 @@
   decided on in part by the requirements of the Udev configuration in this
   chapter, and in part by common convention employed by a number of existing
-  Linux distributions. The Linux Standard Base (LSB, available at <ulink
+  Linux distributions. In addition, some test suites rely on specific users
+  or groups.  The Linux Standard Base (LSB, available at <ulink
   url="http://www.linuxbase.org"/>) recommends only that, besides the group
   <systemitem class="groupname">root</systemitem> with a Group ID (GID) of 0,
Index: chapter06/dbus.xml
===================================================================
--- chapter06/dbus.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/dbus.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -75,5 +75,5 @@
     packages that are not included in LFS. Instructions for running the
     testsuite can be found in the BLFS book at
-    <ulink url="&blfs-root;/view/svn/general/dbus.html"/>.</para>
+    <ulink url="&blfs-root;/view/&short-version;/general/dbus.html"/>.</para>
 
     <para>Install the package:</para>
@@ -93,4 +93,9 @@
 
 <screen><userinput remap="install">ln -sv /etc/machine-id /var/lib/dbus</userinput></screen>
+
+    <para>Finally, generate a D-Bus UUID to avoid possible warnings 
+    when building some packages in BLFS:</para>
+
+<screen><userinput remap="install">dbus-uuidgen --ensure</userinput></screen>
 
   </sect2>
Index: chapter06/e2fsprogs.xml
===================================================================
--- chapter06/e2fsprogs.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/e2fsprogs.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -45,8 +45,9 @@
     <title>Installation of E2fsprogs</title>
 
-    <para>First fix a problem with running regression tests in the LFS chroot
+    <para>First fix some problems with running regression tests in the LFS chroot
     environment:</para>
 
-<screen><userinput remap="pre">sed -i -e 's|^LD_LIBRARY_PATH.*|&amp;:/tools/lib|' tests/test_config</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&e2fsprogs-fix-test-patch;
+sed -i -e 's|^LD_LIBRARY_PATH.*|&amp;:/tools/lib|' tests/test_config</userinput></screen>
 
     <para>The E2fsprogs documentation recommends that the package be built in
@@ -122,7 +123,11 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results, issue:</para>
-
-<screen><userinput remap="test">make check</userinput></screen>
+    <para>To set up the test suite we need to temporarily copy
+    a library from /tools/lib so the test programs can find it. 
+    To run the tests, issue:</para>
+
+<screen><userinput remap="test">cp -v /tools/lib/libblkid.so.1 /lib
+make check
+rm -v /lib/libblkid.so.1</userinput></screen>
 
     <para>One of the E2fsprogs tests will attempt to allocate 256 MB of memory.
@@ -130,7 +135,5 @@
     sufficient swap space for the test. See <xref
     linkend="space-creatingfilesystem"/> and <xref linkend="space-mounting"/>
-    for details on creating and enabling swap space.  Additionally,
-    three tests try to allocate a two terabyte partition and will fail
-    unless you have at least that much unused disk space available.</para>
+    for details on creating and enabling swap space.</para>
 
     <para>Install the binaries, documentation, and shared libraries:</para>
Index: chapter06/gcc.xml
===================================================================
--- chapter06/gcc.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/gcc.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -42,4 +42,9 @@
     <title>Installation of GCC</title>
 
+    <para>First fix a problem identified upstream that causes some 
+    programs to fail:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen>
+<!--
     <para>As in <xref linkend="ch-tools-gcc-pass2"/>, apply the following
     <command>sed</command> to force the build to use the
@@ -50,17 +55,5 @@
   i?86) sed -i 's/^T_CFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in ;;
 esac</userinput></screen>
-<!--
-    <para>Workaround a bug so that GCC doesn't install
-    <filename class="libraryfile">libiberty.a</filename>, which is already
-    provided by Binutils:</para>
-
-<screen><userinput remap="pre">sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
 -->
-    <para>Also fix an error in one of the check Makefiles and disable one test in
-    the g++ libmudflap test suite:</para>
-
-<screen><userinput remap="pre">sed -i -e /autogen/d -e /check.sh/d fixincludes/Makefile.in 
-mv -v libmudflap/testsuite/libmudflap.c++/pass41-frag.cxx{,.disable}</userinput></screen>
-
     <para>The GCC documentation recommends building GCC outside of the source
     directory in a dedicated build directory:</para>
@@ -158,4 +151,18 @@
 <screen><userinput remap="install">ln -sv gcc /usr/bin/cc</userinput></screen>
 
+    <para>Add a compatibility symlink to enable building programs with
+    Link Time Optimization (LTO):</para> 
+
+<screen><userinput remap="install">install -dm755 /usr/lib/bfd-plugins
+pushd /usr/lib/bfd-plugins
+
+if [ $(uname -m) == "i686" ]; then 
+   ln -sfv ../../libexec/gcc/i686-pc-linux-gnu/&gcc-version;/liblto_plugin.so 
+else
+   ln -sfv ../../libexec/gcc/x86_64-unknown-linux-gnu/&gcc-version;/liblto_plugin.so 
+fi
+
+popd</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
Index: chapter06/gdbm.xml
===================================================================
--- chapter06/gdbm.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/gdbm.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -24,8 +24,9 @@
     <title/>
 
-    <para>The GDBM package contains the GNU Database Manager.  This is a disk
-    file format database which stores key/data-pairs in single files.  The
-    actual data of any record being stored is indexed by a unique key, which can
-    be retrieved in less time than if it was stored in a text file.</para>
+    <para>The GDBM package contains the GNU Database Manager.  It is a library
+    of database functions that use extensible hashing and work similar to the
+    standard UNIX dbm.  The library provides primitives for storing key/data
+    pairs, searching and retrieving the data by its key and deleting a key
+    along with its data. </para>
 
     <segmentedlist>
@@ -83,5 +84,5 @@
 
       <seglistitem>
-        <seg>testgdbm</seg>
+        <seg>gdbm_dump, gdbm_load, and gdbmtool</seg>
         <seg>libgdbm.{a,so} and libgdbm_compat.{a,so}</seg>
       </seglistitem>
@@ -93,10 +94,30 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="testgdbm">
-        <term><command>testgdbm</command></term>
+      <varlistentry id="gdbm_dump">
+        <term><command>gdbm_dump</command></term>
+        <listitem>
+          <para>Dumps a GDBM database to a file.</para>
+          <indexterm zone="ch-system-gdbm gdbm_dump">
+            <primary sortas="b-gdbm_dump">gdbm_dump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gdbm_load">
+        <term><command>gdbm_load</command></term>
+        <listitem>
+          <para>Recreates a GDBM database from a dump file.</para>
+          <indexterm zone="ch-system-gdbm gdbm_load">
+            <primary sortas="b-gdbm_load">gdbm_load</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gdbmtool">
+        <term><command>gdbmtool</command></term>
         <listitem>
           <para>Tests and modifies a GDBM database</para>
-          <indexterm zone="ch-system-gdbm testgdbm">
-            <primary sortas="b-testgdbm">testgdbm</primary>
+          <indexterm zone="ch-system-gdbm gdbmtool">
+            <primary sortas="b-gdbmtool">gdbmtool</primary>
           </indexterm>
         </listitem>
@@ -113,4 +134,14 @@
       </varlistentry>
 
+      <varlistentry id="libgdbm_compat">
+        <term><filename class="libraryfile">libgdbm_compat</filename></term>
+        <listitem>
+          <para>Compatibility library containing older DBM functions</para>
+          <indexterm zone="ch-system-gdbm libgdbm_compat">
+            <primary sortas="c-libgdbm_compat">libgdbm_compat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: chapter06/glibc.xml
===================================================================
--- chapter06/glibc.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/glibc.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -418,5 +418,5 @@
         pldd, rpcgen, sln, sotruss, sprof, tzselect, xtrace,
         zdump, and zic</seg>
-        <seg>ld.so, libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
+        <seg>ld-&glibc-version;.so, libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
         libc.{a,so}, libc_nonshared.a, libcidn.so,
         libcrypt.{a,so}, libdl.{a,so}, libg.a, libieee.a, libm.{a,so},
@@ -704,9 +704,9 @@
 
       <varlistentry id="ld.so">
-        <term><filename class="libraryfile">ld.so</filename></term>
+        <term><filename class="libraryfile">ld-&glibc-version;.so</filename></term>
         <listitem>
           <para>The helper program for shared library executables</para>
           <indexterm zone="ch-system-glibc ld.so">
-            <primary sortas="c-ld.so">ld.so</primary>
+            <primary sortas="c-ld.so">ld-&glibc-version;.so</primary>
           </indexterm>
         </listitem>
Index: chapter06/groff.xml
===================================================================
--- chapter06/groff.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/groff.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -63,10 +63,4 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
-
-    <para>Some documentation programs, such as <command>xman</command>,
-    will not work properly without the following symlinks:</para>
-
-<screen><userinput remap="install">ln -sv eqn /usr/bin/geqn
-ln -sv tbl /usr/bin/gtbl</userinput></screen>
 
   </sect2>
Index: chapter06/mpfr.xml
===================================================================
--- chapter06/mpfr.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/mpfr.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -41,4 +41,9 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
+
+    <para>First, apply the following patch to fix various bugs that have been
+    addressed upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&mpfr-fixes-patch;</userinput></screen>
 
     <para>Prepare MPFR for compilation:</para>
Index: chapter06/perl.xml
===================================================================
--- chapter06/perl.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/perl.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -84,6 +84,6 @@
         <term><parameter>-Dpager="/usr/bin/less -isR"</parameter></term>
         <listitem>
-          <para>This corrects an error in the way that <command>perldoc</command>
-          invokes the <command>less</command> program.</para>
+          <para>This ensures that <userinput>less</userinput> is used instead 
+          of <userinput>more</userinput>.</para>
         </listitem>
       </varlistentry>
Index: chapter06/readline.xml
===================================================================
--- chapter06/readline.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/readline.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -42,4 +42,9 @@
     <title>Installation of Readline</title>
 
+    <para>First install some patches to fix various bugs that have been
+    addressed upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
+
     <para>Reinstalling Readline will cause the old libraries to be moved to
     &lt;libraryname&gt;.old. While this is normally not a problem, in some cases
@@ -76,5 +81,5 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make SHLIB_LIBS=-lncurses install</userinput></screen>
 
     <para>Now move the dynamic libraries to a more appropriate location
Index: chapter06/shadow.xml
===================================================================
--- chapter06/shadow.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/shadow.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -72,4 +72,9 @@
 <screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
     </note>
+
+    <para>Make a minor change to make the default useradd consistent with the LFS
+    groups file:</para>
+
+<screen><userinput remap="pre">sed -i 's/1000/999/' etc/useradd</userinput></screen>
 
     <para>Prepare Shadow for compilation:</para>
Index: chapter06/systemd.xml
===================================================================
--- chapter06/systemd.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ chapter06/systemd.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -48,8 +48,9 @@
 HAVE_BLKID=1
 BLKID_LIBS="-lblkid"
-BLKID_CFLAGS="-I/tools/include/blkid"</literal>
+BLKID_CFLAGS="-I/tools/include/blkid"
+cc_cv_CFLAGS__flto=no</literal>
 EOF</userinput></screen>
 
-    <para>Aditionally, fix a build error when using Util-Linux built in
+    <para>Additionally, fix a build error when using Util-Linux built in
     Chapter 5:</para>
 
@@ -63,5 +64,5 @@
     <para>Prepare Systemd for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                                           \
+<screen><userinput remap="configure">CFLAGS="-fno-lto" ./configure --prefix=/usr                         \
             --sysconfdir=/etc                                       \
             --localstatedir=/var                                    \
Index: general.ent
===================================================================
--- general.ent	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ general.ent	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -1,4 +1,5 @@
-<!ENTITY version         "20140412-systemd">
-<!ENTITY releasedate     "April 12, 2014">
+<!ENTITY version         "20140614-systemd">
+<!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for release -->
+<!ENTITY releasedate     "June 14, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.6">
Index: packages.ent
===================================================================
--- packages.ent	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ packages.ent	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -63,5 +63,5 @@
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
 <!ENTITY binutils-md5 "e0f71a7b2ddab0f8612336ac81d9636b">
-<!ENTITY binutils-home "http://www.gnu.org/software/binutils/">
+<!ENTITY binutils-home "$gnu-software;binutils/">
 <!ENTITY binutils-ch5p1-du "404 MB">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
@@ -93,8 +93,8 @@
 <!ENTITY bzip2-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY check-version "0.9.12">
-<!ENTITY check-size "714 KB">
+<!ENTITY check-version "0.9.13">
+<!ENTITY check-size "736 KB">
 <!ENTITY check-url "http://sourceforge.net/projects/check/files/check/&check-version;/check-&check-version;.tar.gz">
-<!ENTITY check-md5 "46fe540d1a03714c7a1967dbc6d484e7">
+<!ENTITY check-md5 "95530868f81a9496b2518fd2b713008a">
 <!ENTITY check-home "http://check.sourceforge.net/">
 <!ENTITY check-ch5-du "6.9 MB">
@@ -140,8 +140,8 @@
      of acceptable features that can be shown by debugfs in
      chapter02/creatingfilesystem.xml -->
-<!ENTITY e2fsprogs-version "1.42.9">
-<!ENTITY e2fsprogs-size "5,928 KB">
-<!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "3f8e41e63b432ba114b33f58674563f7">
+<!ENTITY e2fsprogs-version "1.42.10">
+<!ENTITY e2fsprogs-size "5,983 KB">
+<!ENTITY e2fsprogs-url "http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
+<!ENTITY e2fsprogs-md5 "62bfe2fe0a194c5c37165789ac2825a8">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch6-du "64 MB">
@@ -197,8 +197,8 @@
 <!ENTITY flex-ch6-sbu "0.4 SBU">
 
-<!ENTITY gawk-version "4.1.0">
-<!ENTITY gawk-size "2,004 KB">
+<!ENTITY gawk-version "4.1.1">
+<!ENTITY gawk-size "2,146 KB">
 <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
-<!ENTITY gawk-md5 "b18992ff8faf3217dab55d2d0aa7d707">
+<!ENTITY gawk-md5 "a2a26543ce410eb74bc4a508349ed09a">
 <!ENTITY gawk-home "&gnu-software;gawk/">
 <!ENTITY gawk-ch5-du "30 MB">
@@ -207,8 +207,8 @@
 <!ENTITY gawk-ch6-sbu "0.2 SBU">
 
-<!ENTITY gcc-version "4.8.2">
-<!ENTITY gcc-size "83,984 KB">
+<!ENTITY gcc-version "4.9.0">
+<!ENTITY gcc-size "87,576 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "a3d7d63b9cb6b6ea049469a0c4a43c9d">
+<!ENTITY gcc-md5 "9709b49ae0e904cbb0a6a1b62853b556">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "1.4 GB">
@@ -229,8 +229,8 @@
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 
-<!ENTITY gettext-version "0.18.3.2">
-<!ENTITY gettext-size "15,810 KB">
-<!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
-<!ENTITY gettext-md5 "241aba309d07aa428252c74b40a818ef">
+<!ENTITY gettext-version "0.19.1">
+<!ENTITY gettext-size "6,456 KB">
+<!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
+<!ENTITY gettext-md5 "b52987f49bc99fa8b410270d47a9d52b">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "119 MB">
@@ -268,8 +268,8 @@
 <!ENTITY gperf-ch6-sbu "0.1 SBU">
 
-<!ENTITY grep-version "2.18">
-<!ENTITY grep-size "1,185 KB">
+<!ENTITY grep-version "2.20">
+<!ENTITY grep-size "1,209 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "7439f8266f50844b56cc3e2721606541">
+<!ENTITY grep-md5 "2cbea44a4f1548aee20b9ff2d3076908">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-ch5-du "21 MB">
@@ -306,7 +306,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-&iana-etc-version;.tar.bz2">
 <!ENTITY iana-etc-md5 "3ba3afb1d1b261383d247f46cb135ee8">
-<!ENTITY iana-etc-home "http://freshmeat.net/projects/iana-etc/">
+<!ENTITY iana-etc-home "http://freecode.com/projects/iana-etc">
 <!ENTITY iana-etc-ch6-du "2.2 MB">
 <!ENTITY iana-etc-ch6-sbu "less than 0.1 SBU">
@@ -328,8 +328,8 @@
 <!ENTITY intltool-ch6-sbu "0.1 SBU">
 
-<!ENTITY iproute2-version "3.12.0">
-<!ENTITY iproute2-size "415 KB">
+<!ENTITY iproute2-version "3.15.0">
+<!ENTITY iproute2-size "428 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "f87386aaaecafab95607fd10e8152c68">
+<!ENTITY iproute2-md5 "5b1711c9d16071959052e369a2682d77">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "7.3 MB">
@@ -339,5 +339,5 @@
 <!ENTITY kbd-size "1,962 KB">
 <!ENTITY kbd-url "http://ftp.altlinux.org/pub/people/legion/kbd/kbd-&kbd-version;.tar.gz">
-<!ENTITY kbd-md5 "cc0ee9f2537d8636cae85a8c6541ed2e">
+<!ENTITY kbd-md5 "e9f2b7046312c11cec9e52e22f307b6a">
 <!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd">
 <!ENTITY kbd-ch6-du "20 MB">
@@ -396,11 +396,11 @@
 
 <!ENTITY linux-major-version "3">
-<!ENTITY linux-minor-version "14">
+<!ENTITY linux-minor-version "15">
 <!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 "76,562 KB">
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
+<!ENTITY linux-size "77,810 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "b621207b3f6ecbb67db18b13258f8ea8">
+<!ENTITY linux-md5 "97ca1625bb40368dc41b9a7971549071">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
@@ -435,16 +435,16 @@
 <!ENTITY make-ch6-sbu "0.4 SBU">
 
-<!ENTITY man-db-version "2.6.6">
-<!ENTITY man-db-size "1,415 KB">
+<!ENTITY man-db-version "2.6.7.1">
+<!ENTITY man-db-size "1,419 KB">
 <!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz">
-<!ENTITY man-db-md5 "5d65d66191080c144437a6c854e17868">
+<!ENTITY man-db-md5 "ce7b697f8e8016a085d9f5975ae6c4fb">
 <!ENTITY man-db-home "http://www.nongnu.org/man-db/">
 <!ENTITY man-db-ch6-du "27 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-pages-version "3.64">
-<!ENTITY man-pages-size "1,194 KB">
-<!ENTITY man-pages-url "http://www.kernel.org/pub/linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "e39da1ac5a5effd4514809301bad47a8">
+<!ENTITY man-pages-version "3.68">
+<!ENTITY man-pages-size "1,225 KB">
+<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
+<!ENTITY man-pages-md5 "43965ed65b34aeff75767b162f97eb01">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "23 MB">
@@ -475,5 +475,5 @@
 <!ENTITY ncurses-url "http://ftp.gnu.org/gnu/ncurses/ncurses-&ncurses-version;.tar.gz">
 <!ENTITY ncurses-md5 "8cb9c412e5f2d96bc6f459aa8c6282a1">
-<!ENTITY ncurses-home "http://www.gnu.org/software/ncurses/">
+<!ENTITY ncurses-home "&gnu-software;ncurses/">
 <!ENTITY ncurses-ch5-du "35 MB">
 <!ENTITY ncurses-ch5-sbu "0.5 SBU">
@@ -491,8 +491,8 @@
 <!ENTITY patch-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY perl-version "5.18.2">
-<!ENTITY perl-size "13,730 KB">
+<!ENTITY perl-version "5.20.0">
+<!ENTITY perl-size "13,448 KB">
 <!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
-<!ENTITY perl-md5 "d549b16ee4e9210988da39193a9389c1">
+<!ENTITY perl-md5 "20cbecd4e9e880ee7a50a136c8b1484e">
 <!ENTITY perl-home "http://www.perl.org/">
 <!ENTITY perl-ch5-du "235 MB">
@@ -519,5 +519,5 @@
 <!ENTITY psmisc-version "22.21">
 <!ENTITY psmisc-size "447 KB">
-<!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz">
+<!ENTITY psmisc-url "http://downloads.sourceforge.net/project/psmisc/psmisc/psmisc-&psmisc-version;.tar.gz">
 <!ENTITY psmisc-md5 "935c0fd6eb208288262b385fa656f1bf">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
@@ -564,5 +564,5 @@
 <!ENTITY tcl-major-version "8.6">
 <!ENTITY tcl-size "8,551 KB">
-<!ENTITY tcl-url "&sourceforge;tcl/tcl&tcl-version;-src.tar.gz">
+<!ENTITY tcl-url "http://downloads.sourceforge.net/project/tcl/Tcl/&tcl-version;/tcl&tcl-version;-src.tar.gz">
 <!ENTITY tcl-md5 "aae4b701ee527c6e4e1a6f9c7399882e">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/">
@@ -580,25 +580,25 @@
 <!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
-<!ENTITY systemd-version "212">
-<!ENTITY systemd-size    "2,659 KB">
+<!ENTITY systemd-version "214">
+<!ENTITY systemd-size    "2,278 KB">
 <!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "257a75fff826ff91cb1ce567091cf270">
+<!ENTITY systemd-md5     "eac4f9fc5bd18a0efc3fc20858baacf3">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
 <!ENTITY systemd-ch6-du  "410 MB">
 <!ENTITY systemd-ch6-sbu "4.5 SBU">
 
-<!ENTITY tzdata-version "2014b">
-<!ENTITY tzdata-size "216 KB">
+<!ENTITY tzdata-version "2014d">
+<!ENTITY tzdata-size "217 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "c58d556612396d4ca5a17807a79924e5">
+<!ENTITY tzdata-md5 "299b86c0368ecfb321f15d5c408a1d9b">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY util-linux-version "2.24.1">
-<!ENTITY util-linux-size "3,461 KB">
+<!ENTITY util-linux-version "2.24.2">
+<!ENTITY util-linux-size "3,503 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.24/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "88d46ae23ca599ac5af9cf96b531590f">
-<!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
+<!ENTITY util-linux-md5 "3f191727a0d28f7204b755cf1b6ea0aa">
+<!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-ch5-du "89 MB">
 <!ENTITY util-linux-ch5-sbu "0.6 SBU">
Index: patches.ent
===================================================================
--- patches.ent	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ patches.ent	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -2,4 +2,16 @@
 
 <!-- Start of Common Patches -->
+
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
+<!ENTITY bash-fixes-patch-md5 "749b4b520708300b64f8166ba2b1b4a0">
+<!ENTITY bash-fixes-patch-size "14 KB">
+
+<!ENTITY binutils-lto-patch "binutils-&binutils-version;-load_gcc_lto_plugin_by_default-1.patch">
+<!ENTITY binutils-lto-patch-md5 "48e4e96a60bfed41804aaecf4944f5d9">
+<!ENTITY binutils-lto-patch-size "2.0 KB">
+
+<!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch">
+<!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8">
+<!ENTITY bc-memory-leak-patch-size "1.4 KB">
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
@@ -11,4 +23,16 @@
 <!ENTITY coreutils-i18n-patch-size "140 KB">
 
+<!ENTITY coreutils-shuf-segfault-patch "coreutils-&coreutils-version;-shuf_segfault-1.patch">
+<!ENTITY coreutils-shuf-segfault-patch-md5 "f1b5b35392914e327b1b6bbbb454d256">
+<!ENTITY coreutils-shuf-segfault-patch-size "4 KB">
+
+<!ENTITY e2fsprogs-fix-test-patch "e2fsprogs-&e2fsprogs-version;-fix_test-1.patch">
+<!ENTITY e2fsprogs-fix-test-patch-md5 "7c20605628536db298bb3bb4666047bf">
+<!ENTITY e2fsprogs-fix-test-patch-size "0.7 KB">
+
+<!ENTITY gcc-upstream-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
+<!ENTITY gcc-upstream-patch-md5 "f070aae5f5f92259ed167539725e6241">
+<!ENTITY gcc-upstream-patch-size "4.0 KB">
+
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
@@ -19,11 +43,21 @@
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
+<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-upstream_fixes-1.patch">
+<!ENTITY mpfr-fixes-patch-md5 "aaf52416b309dd0b8c5eb92ae9c210c1">
+<!ENTITY mpfr-fixes-patch-size "43 KB">
+
+<!--
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
 <!ENTITY perl-libc-patch-md5 "daf5c64fd7311e924966842680535f8f">
 <!ENTITY perl-libc-patch-size "1.6 KB">
+-->
+
+<!ENTITY readline-fixes-patch "readline-6.3-upstream_fixes-1.patch">
+<!ENTITY readline-fixes-patch-md5 "bbee7fad08474328b807e6828c26a961">
+<!ENTITY readline-fixes-patch-size "3.1 KB">
 
 <!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
-<!ENTITY systemd-compat-patch-md5 "7a1202e996122e6f2e10e94cba862ed8">
-<!ENTITY systemd-compat-patch-size "10 KB">
+<!ENTITY systemd-compat-patch-md5 "1f87b648878a0f6f16717e17920d2198">
+<!ENTITY systemd-compat-patch-size "8.0 KB">
 
 <!ENTITY tar-manpage-patch "tar-&tar-version;-manpage-1.patch">
Index: prologue/hostreqs.xml
===================================================================
--- prologue/hostreqs.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ prologue/hostreqs.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -195,6 +195,19 @@
   then echo "g++ compilation OK";
   else echo "g++ compilation failed"; fi
-rm -f dummy.c dummy
-
+rm -f dummy.c dummy</literal>
+<!--
+for lib in lib{gmp,mpfr,mpc}.la; do
+  echo $lib: $(if find /usr/lib* -name $lib|
+               grep -q $lib;then :;else echo not;fi) found
+done
+unset lib</literal>-->
+EOF
+
+bash version-check.sh</userinput></screen>
+
+  <para>Also check for some library consistency:</para>
+
+<screen role="nodump"><userinput>cat &gt; library-check.sh &lt;&lt; "EOF"
+<literal>#!/bin/bash
 for lib in lib{gmp,mpfr,mpc}.la; do
   echo $lib: $(if find /usr/lib* -name $lib|
@@ -204,5 +217,9 @@
 EOF
 
-bash version-check.sh</userinput></screen>
+bash library-check.sh</userinput></screen>
+
+<para>The files identified by this script should be all present
+or all absent, but not only one or two present.</para>
+
 
 </sect2>
Index: prologue/prerequisites.xml
===================================================================
--- prologue/prerequisites.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ prologue/prerequisites.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -47,5 +47,5 @@
       reference is also fairly old, but still valid.</para>
     </listitem>
-
+<!--
     <listitem>
       <para>The Essential Pre-Reading Hint
@@ -57,5 +57,5 @@
       understanding of many of the topics in this hint.</para>
     </listitem>
-
+-->
   </itemizedlist>
 
Index: prologue/why.xml
===================================================================
--- prologue/why.xml	(revision 6f34f438e62ee95fd8b9025984ecc0a0bafd1f32)
+++ prologue/why.xml	(revision 61ce0b1fe4ffbf86ef3189e733f9f372cac419aa)
@@ -39,4 +39,21 @@
 
       <listitem>
+        <para>Acl</para>
+
+        <para>This package contains utilities to administer Access 
+        Control Lists, which are used to define more fine-grained 
+        discretionary access rights for files and directories. 
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>Attr</para>
+
+        <para>This package contains programs for administering  
+        extended attributes on filesystem objects. 
+        </para>
+      </listitem>
+
+      <listitem>
         <para>Autoconf</para>
 
@@ -117,4 +134,12 @@
 
       <listitem>
+        <para>D-Bus</para>
+
+        <para>This package contains programs to implement a message bus system, 
+        which a simple way for applications to talk to one another.
+        </para>
+      </listitem>
+
+      <listitem>
         <para>DejaGNU</para>
 
@@ -144,4 +169,12 @@
         <para>This package contains a relatively small XML parsing library.  It
         is required by the XML::Parser Perl module.</para>
+      </listitem>
+
+      <listitem>
+        <para>Expat</para>
+
+        <para>This package contains programs for parsing XML.  It is
+        required for systemd.
+        </para>
       </listitem>
 
@@ -230,4 +263,12 @@
 
       <listitem>
+        <para>Gperf</para>
+
+        <para>This package a program that generates a perfect hash function 
+        from a key set.  It is required for systemd.
+        </para>
+      </listitem>
+
+      <listitem>
         <para>Grep</para>
 
@@ -281,4 +322,11 @@
 
       <listitem>
+        <para>Intltool</para>
+
+        <para>This package contains tools for extracting translatable 
+        strings from source files.</para>
+      </listitem>
+
+      <listitem>
         <para>IProute2</para>
 
@@ -316,4 +364,12 @@
         partitioned into a set of distinct privileges.  It is required by
         Systemd.</para>
+      </listitem>
+
+      <listitem>
+        <para>Libcap</para>
+
+        <para>This package implements the user-space interfaces to 
+        the POSIX 1003.1e capabilities available in Linux kernels. 
+        </para>
       </listitem>
 
@@ -465,4 +521,14 @@
 
       <listitem>
+        <para>Systemd</para>
+
+        <para>This package provides and <application>init</application> program
+        and several additional boot and system control capabilites as an
+        alternative to Sysvinit.  It is used by many commercial distributions.
+        In LFS it is installed side-by-side with Sysvinit to provide the user with
+        alternative boot systems for comparison.</para>
+      </listitem>
+
+      <listitem>
         <para>Sysvinit</para>
 
@@ -518,4 +584,10 @@
 
       <listitem>
+        <para>XML::Parser</para>
+
+        <para>This package is a Perl module that interfaces with Expat.</para>
+      </listitem>
+
+      <listitem>
         <para>XZ Utils</para>
 
