Index: lfs_xml/appendices/acknowledgments.xml
===================================================================
--- lfs_xml/appendices/acknowledgments.xml	(revision 10973)
+++ lfs_xml/appendices/acknowledgments.xml	(working copy)
@@ -7,7 +7,7 @@
 
 <appendix id="appendixb" xreflabel="Appendix B">
   <?dbhtml dir="appendices"?>
-  <?dbhtml filename="acknowledgements.html"?>
+  <?dbhtml filename="acknowledgments.html"?>
 
   <title>Acknowledgments</title>
 
Index: lfs_xml/appendices/dependencies.xml
===================================================================
--- lfs_xml/appendices/dependencies.xml	(revision 10973)
+++ lfs_xml/appendices/dependencies.xml	(working copy)
@@ -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>
 
Index: lfs_xml/chapter01/chapter01.xml
===================================================================
--- lfs_xml/chapter01/chapter01.xml	(revision 10973)
+++ lfs_xml/chapter01/chapter01.xml	(working copy)
@@ -1,21 +1,545 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
 
-<chapter id="chapter-intro" xreflabel="Chapter 1">
-  <?dbhtml dir="chapter01"?>
-  <?dbhtml filename="chapter01.html"?>
+<sect1 id="ch-scatter-changelog">
+  <?dbhtml filename="changelog.html"?>
 
-  <title>Introduction</title>
+  <title>Changelog</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="how.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="askforhelp.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="livecd.xml"/>-->
+  <para>This is version &version; of the Linux From Scratch book, dated
+  &releasedate;. If this book is more than six months old, a newer and better
+  version is probably already available. To find out, please check one of the
+  mirrors via <ulink url="&lfs-root;mirrors.html"/>.</para>
 
-</chapter>
+  <para>Below is a list of changes made since the previous release of the
+  book.</para>
+
+  <itemizedlist>
+    <title>Changelog Entries:</title>
+
+<!-- Changelog template
+
+    <listitem>
+      <para>Date</para>
+      <itemizedlist>
+        <listitem>
+          <para>[name] - New changelog entry.</para>
+        </listitem>
+        <listitem>
+          <para>[name] - Previous changelog entry.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+-->
+
+    <listitem>
+      <para>2015-09-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix a warning when doing the GCC compile tests.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Add additional discussion about copying LFS systems
+          from one machine to another machine.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Provide ncurses non-wide-character libraries that
+          are compliant with version 5 of ncurses.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Remove unnecessary sed in e2fsprogs.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to util-linux-2.27.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to linux-4.2.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to iproute2-4.2.0.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Refresh build sizes and SBU values.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-08-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Add an upstream patch for MPFR.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libpipeline-1.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to linux-4.1.6.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to man-db-2.7.2.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Add a patch to allow glibc to build properly on i386 systems.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Remove obsolete r* programs from inetutils.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-08-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add a workaround to ncurses in
+          Chapter 5 for hosts that have mawk installed.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to binutils-2.25.1.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to check-0.10.0.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to procps-ng-3.3.11.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to man-pages-4.02.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to glibc-2.22.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to linux-4.1.5.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to tzdata2015f.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+     
+    <listitem>
+      <para>2015-07-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Fixed a warning in the intltool-update
+          perl script caused by perl-5.22.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Updated to dbus-1.8.20.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Updated to systemd-222.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-07-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gcc-5.2.0. Fixes
+          <ulink url="&lfs-ticket-root;3819">*3819</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.19.5.1. Fixes
+          <ulink url="&lfs-ticket-root;3818">*3818</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kbd-2.0.3. Fixes
+          <ulink url="&lfs-ticket-root;3815">#3815</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-07-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-4.1.1. Fixes
+          <ulink url="&lfs-ticket-root;3811">*3811</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to file-5.24. Fixes
+          <ulink url="&lfs-ticket-root;3812">*3812</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.1.2. Fixes
+          <ulink url="&lfs-ticket-root;3814">#3814</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.19.5. Fixes
+          <ulink url="&lfs-ticket-root;3813">#3813</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix a warning in the installed automake 
+          perl script.
+          <ulink url="&lfs-ticket-root;3809">#3809</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-07-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-4.1.0. Fixes
+          <ulink url="&lfs-ticket-root;3802">*3802</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to texinfo-6.0. Fixes
+          <ulink url="&lfs-ticket-root;3803">*3803</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.1.1. Fixes
+          <ulink url="&lfs-ticket-root;3805">#3805</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to coreutils-8.24. Fixes
+          <ulink url="&lfs-ticket-root;3806">#3806</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update perl installed files. Fixes
+          <ulink url="&lfs-ticket-root;3804">#3804</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-06-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Updated to systemd-221.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-06-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2015e. Fixes
+          <ulink url="&lfs-ticket-root;3798">*3798</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mpfr-3.1.3. Fixes
+          <ulink url="&lfs-ticket-root;3800">#3800</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.1. Fixes
+          <ulink url="&lfs-ticket-root;3801">#3801</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-06-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Simplify gcc-pass1 instructions. Thanks to
+          Pierre Labastie for the patch. Fixes 
+          <ulink url="&lfs-ticket-root;3797">#3797</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-06-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update standards discussion for FHS 3.0
+          and LSB-5.0.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to inetutils-1.9.4. Fixes 
+          <ulink url="&lfs-ticket-root;3796">#3796</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to file-5.23. Fixes 
+          <ulink url="&lfs-ticket-root;3795">#3795</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kmod-21. Fixes 
+          <ulink url="&lfs-ticket-root;3794">#3794</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-06-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.0.5. Fixes 
+          <ulink url="&lfs-ticket-root;3793">#3793</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-06-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to perl-5.22.0. Fixes 
+          <ulink url="&lfs-ticket-root;3791">#3791</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-05-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to bash-4.3.30-upstream_fixes-2.patch. 
+          Fixes <ulink url="&lfs-ticket-root;3789">#3789</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-05-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.0.4. Fixes
+          <ulink url="&lfs-ticket-root;3786">#3786</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.42.13. Fixes
+          <ulink url="&lfs-ticket-root;3787">#3787</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gawk-4.1.3. Fixes
+          <ulink url="&lfs-ticket-root;3788">#3788</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Added a new patch for gcc to fix inline
+          issues and some libgomp problems.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-05-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add a patch from upstream to fix 
+          some libgomp (gcc) problems.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-05-14</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gawk-4.1.2. Fixes
+          <ulink url="&lfs-ticket-root;3781">#3781</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.0.3. Fixes
+          <ulink url="&lfs-ticket-root;3782">#3782</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.26.2. Fixes
+          <ulink url="&lfs-ticket-root;3783">#3783</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-4.00. Fixes
+          <ulink url="&lfs-ticket-root;3784">#3784</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to inetutils-1.9.3. Fixes
+          <ulink url="&lfs-ticket-root;3785">#3785</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Updated to dbus-1.8.18.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-04-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Updated to tzdata-2015d. Fixes
+          <ulink url="&lfs-ticket-root;3780">#3780</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-04-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Added a fix for security issue
+          in Glibc (CVE-2015-1781). Thanks to Ken Moffat
+          for identifying the problem and the fix.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Fixed Ncurses and Perl build
+          with GCC 5. Thanks to Ken Moffat and Douglas
+          R. Reno for providing the patches.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Updated to GCC-5.1.0. Fixes
+          <ulink url="&lfs-ticket-root;3779">#3779</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-04-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.8.3. Fixes
+          <ulink url="&lfs-ticket-root;3778">#3778</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-04-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.0. Fixes
+          <ulink url="&lfs-ticket-root;3775">#3775</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2015c. Fixes
+          <ulink url="&lfs-ticket-root;3776">#3776</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-4.0.0. Fixes
+          <ulink url="&lfs-ticket-root;3777">#3777</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-03-31</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Adjust discussion of LFS envronment variable to be
+          before first use.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Use --with-glibc-version=2.11 in gcc-pass1.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to dejagnu-1.5.3. Fixes
+          <ulink url="&lfs-ticket-root;3773">#3773</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-03-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.19.3. Fixes
+          <ulink url="&lfs-ticket-root;3772">#3772</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata2015b. Fixes
+          <ulink url="&lfs-ticket-root;3770">#3770</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-03-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.19.2. Fixes
+          <ulink url="&lfs-ticket-root;3768">#3768</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-03-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to tcl-core-8.6.4. Fixes
+          <ulink url="&lfs-ticket-root;3766">#3766</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.26.1. Fixes
+          <ulink url="&lfs-ticket-root;3767">#3767</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Remove non-essential static libraries
+          from the installation. Added a new section in Chapter 6 
+          Introduction, suppressed many static libraries in different
+          packages, and removed the remaining in the Cleaning Up section.
+          Fixes
+          <ulink url="&lfs-ticket-root;3751">#3751</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-03-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to intltool-0.51.0. Fixes
+          <ulink url="&lfs-ticket-root;3764">#3764</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-03-08</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.19.1. Fixes
+          <ulink url="&lfs-ticket-root;3763">#3763</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to patch-2.7.5. Fixes
+          <ulink url="&lfs-ticket-root;3762">#3762</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Change tcl to minimal tcl-core package. Fixes
+          <ulink url="&lfs-ticket-root;3752">#3752</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-03-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to mpc-1.0.3. Fixes
+          <ulink url="&lfs-ticket-root;3753">#3753</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.8.1. Fixes
+          <ulink url="&lfs-ticket-root;3754">#3754</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xz-5.2.1. Fixes
+          <ulink url="&lfs-ticket-root;3757">#3757</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kmod-20. Fixes
+          <ulink url="&lfs-ticket-root;3758">#3758</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-03-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - LFS-7.7-systemd released.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+  </itemizedlist>
+</sect1>
Index: lfs_xml/chapter01/whatsnew.xml
===================================================================
--- lfs_xml/chapter01/whatsnew.xml	(revision 10973)
+++ lfs_xml/chapter01/whatsnew.xml	(working copy)
@@ -40,9 +40,9 @@
     <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Binutils &binutils-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Bison &bison-version;</para>
     </listitem>-->
@@ -49,18 +49,18 @@
     <!--<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>-->
+    <!--<listitem>
       <para>D-Bus-&dbus-version;</para>
     </listitem>
     <listitem>
       <para>DejaGNU &dejagnu-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
@@ -79,15 +79,15 @@
     <!--<listitem>
       <para>Findutils &findutils-version;</para>
     </listitem>-->
+    <listitem>
+      <para>Flex &flex-version;</para>
+    </listitem>
     <!--<listitem>
-      <para>Flex &flex-version;</para>
+      <para>Gawk &gawk-version;</para>
     </listitem>-->
-    <listitem>
-      <para>Gawk &gawk-version;</para>
-    </listitem>
-    <listitem>
+    <!--<listitem>
       <para>GCC &gcc-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>GDBM &gdbm-version;</para>
     </listitem>-->
@@ -94,9 +94,9 @@
     <listitem>
       <para>Gettext &gettext-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>Glibc &glibc-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>GMP &gmp-version;</para>
     </listitem>-->
@@ -103,9 +103,9 @@
     <!--<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>-->
@@ -157,31 +157,31 @@
     <listitem>
       <para>Man-DB &man-db-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>Man-pages &man-pages-version;</para>
-    </listitem>
-    <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>-->
+    <!--<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,28 @@
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
     <listitem>
-      <para>&bash-fixes-patch;</para>
+      <para>&glibc-largefile-patch;</para>
     </listitem>
 <!--
-    <listitem>
+    <!--<listitem>
       <para>&gcc-upstream-patch;</para>
     </listitem>
 -->
     <listitem>
       <para>&glibc-upstream-patch;</para>
-    </listitem>
+    </listitem>-->
 
-    <listitem>
+    <!--<listitem>
       <para>&mpfr-upstream-patch;</para>
-    </listitem>
+    </listitem>-->
 
-    <listitem>
+    <!--<listitem>
       <para>&systemd-compat-patch;</para>
     </listitem>
 
     <listitem>
       <para>Tcl-core-&tcl-version;</para>
-    </listitem>
+    </listitem>-->
 
   </itemizedlist>
 
@@ -268,21 +268,21 @@
     <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>-->
 
-    <listitem>
+    <!--<listitem>
       <para>systemd-219-compat-1.patch</para>
-    </listitem>
+    </listitem>-->
 
-    <listitem>
+    <!--<listitem>
       <para>Tcl-8.6.3</para>
-    </listitem>
+    </listitem>-->
 
 
   </itemizedlist>
Index: lfs_xml/chapter02/aboutlfs.xml
===================================================================
--- lfs_xml/chapter02/aboutlfs.xml	(revision 10973)
+++ lfs_xml/chapter02/aboutlfs.xml	(working copy)
@@ -28,6 +28,7 @@
   <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
@@ -41,6 +42,7 @@
   provided example was followed. If the output is incorrect, use the command
   given earlier on this  page to set <envar>$LFS</envar> to the correct
   directory name.</para>
+  </caution>
 
   <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
Index: lfs_xml/chapter02/creatingfilesystem.xml
===================================================================
--- lfs_xml/chapter02/creatingfilesystem.xml	(revision 10973)
+++ lfs_xml/chapter02/creatingfilesystem.xml	(working copy)
@@ -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>
Index: lfs_xml/chapter02/mounting.xml
===================================================================
--- lfs_xml/chapter02/mounting.xml	(revision 10973)
+++ lfs_xml/chapter02/mounting.xml	(working copy)
@@ -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> environment variable as described in the previous section.
   </para>
 
   <para>Create the mount point and mount the LFS file system by running:</para>
Index: lfs_xml/chapter03/patches.xml
===================================================================
--- lfs_xml/chapter03/patches.xml	(revision 10973)
+++ lfs_xml/chapter03/patches.xml	(working copy)
@@ -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>
Index: lfs_xml/chapter05/glibc.xml
===================================================================
--- lfs_xml/chapter05/glibc.xml	(revision 10973)
+++ lfs_xml/chapter05/glibc.xml	(working copy)
@@ -129,7 +129,7 @@
       <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 @@
       <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>
Index: lfs_xml/chapter05/libstdc++.xml
===================================================================
--- lfs_xml/chapter05/libstdc++.xml	(revision 10973)
+++ lfs_xml/chapter05/libstdc++.xml	(working copy)
@@ -97,7 +97,7 @@
           <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>
Index: lfs_xml/chapter06/acl.xml
===================================================================
--- lfs_xml/chapter06/acl.xml	(revision 10973)
+++ lfs_xml/chapter06/acl.xml	(working copy)
@@ -98,7 +98,7 @@
 
       <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>
Index: lfs_xml/chapter06/adjusting.xml
===================================================================
--- lfs_xml/chapter06/adjusting.xml	(revision 10973)
+++ lfs_xml/chapter06/adjusting.xml	(working copy)
@@ -55,7 +55,7 @@
   <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>
 
Index: lfs_xml/chapter06/attr.xml
===================================================================
--- lfs_xml/chapter06/attr.xml	(revision 10973)
+++ lfs_xml/chapter06/attr.xml	(working copy)
@@ -91,7 +91,7 @@
 
       <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>
Index: lfs_xml/chapter06/automake.xml
===================================================================
--- lfs_xml/chapter06/automake.xml	(revision 10973)
+++ lfs_xml/chapter06/automake.xml	(working copy)
@@ -77,10 +77,8 @@
       <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 @@
         </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>
Index: lfs_xml/chapter06/bc.xml
===================================================================
--- lfs_xml/chapter06/bc.xml	(revision 10973)
+++ lfs_xml/chapter06/bc.xml	(working copy)
@@ -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>
Index: lfs_xml/chapter06/bison.xml
===================================================================
--- lfs_xml/chapter06/bison.xml	(revision 10973)
+++ lfs_xml/chapter06/bison.xml	(working copy)
@@ -52,10 +52,16 @@
 
 <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>
 
 <screen><userinput remap="install">make install</userinput></screen>
Index: lfs_xml/chapter06/chapter06.xml
===================================================================
--- lfs_xml/chapter06/chapter06.xml	(revision 10973)
+++ lfs_xml/chapter06/chapter06.xml	(working copy)
@@ -42,8 +42,8 @@
   <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="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="bison.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"/>
Index: lfs_xml/chapter06/dbus.xml
===================================================================
--- lfs_xml/chapter06/dbus.xml	(revision 10973)
+++ lfs_xml/chapter06/dbus.xml	(working copy)
@@ -72,9 +72,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>
Index: lfs_xml/chapter06/e2fsprogs.xml
===================================================================
--- lfs_xml/chapter06/e2fsprogs.xml	(revision 10973)
+++ lfs_xml/chapter06/e2fsprogs.xml	(working copy)
@@ -177,12 +177,11 @@
         <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>
 
@@ -528,7 +527,7 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="libquota">
         <term><filename class="libraryfile">libquota</filename></term>
         <listitem>
@@ -539,7 +538,7 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="libss">
         <term><filename class="libraryfile">libss</filename></term>
         <listitem>
Index: lfs_xml/chapter06/expat.xml
===================================================================
--- lfs_xml/chapter06/expat.xml	(revision 10973)
+++ lfs_xml/chapter06/expat.xml	(working copy)
@@ -74,7 +74,7 @@
 
       <seglistitem>
         <seg>xmlwf</seg>
-        <seg>libexpat.{a,so}</seg>
+        <seg>libexpat.so</seg>
         <seg>/usr/share/doc/expat-&expat-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: lfs_xml/chapter06/findutils.xml
===================================================================
--- lfs_xml/chapter06/findutils.xml	(revision 10973)
+++ lfs_xml/chapter06/findutils.xml	(working copy)
@@ -90,7 +90,7 @@
       <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 @@
       <?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 @@
         </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>
Index: lfs_xml/chapter06/flex.xml
===================================================================
--- lfs_xml/chapter06/flex.xml	(revision 10973)
+++ lfs_xml/chapter06/flex.xml	(working copy)
@@ -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>
Index: lfs_xml/chapter06/gcc.xml
===================================================================
--- lfs_xml/chapter06/gcc.xml	(revision 10973)
+++ lfs_xml/chapter06/gcc.xml	(working copy)
@@ -139,7 +139,8 @@
     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 +375,7 @@
         <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 +388,7 @@
         <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 +401,7 @@
         <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>
Index: lfs_xml/chapter06/gdbm.xml
===================================================================
--- lfs_xml/chapter06/gdbm.xml	(revision 10973)
+++ lfs_xml/chapter06/gdbm.xml	(working copy)
@@ -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>
 
Index: lfs_xml/chapter06/gettext.xml
===================================================================
--- lfs_xml/chapter06/gettext.xml	(revision 10973)
+++ lfs_xml/chapter06/gettext.xml	(working copy)
@@ -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>
Index: lfs_xml/chapter06/glibc.xml
===================================================================
--- lfs_xml/chapter06/glibc.xml	(revision 10973)
+++ lfs_xml/chapter06/glibc.xml	(working copy)
@@ -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>
 
@@ -271,7 +276,7 @@
     <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 @@
       <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 @@
       <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 @@
     <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>
Index: lfs_xml/chapter06/gmp.xml
===================================================================
--- lfs_xml/chapter06/gmp.xml	(revision 10973)
+++ lfs_xml/chapter06/gmp.xml	(working copy)
@@ -111,7 +111,7 @@
       <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>
Index: lfs_xml/chapter06/gperf.xml
===================================================================
--- lfs_xml/chapter06/gperf.xml	(revision 10973)
+++ lfs_xml/chapter06/gperf.xml	(working copy)
@@ -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>
 
Index: lfs_xml/chapter06/grep.xml
===================================================================
--- lfs_xml/chapter06/grep.xml	(revision 10973)
+++ lfs_xml/chapter06/grep.xml	(working copy)
@@ -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>
Index: lfs_xml/chapter06/groff.xml
===================================================================
--- lfs_xml/chapter06/groff.xml	(revision 10973)
+++ lfs_xml/chapter06/groff.xml	(working copy)
@@ -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,16 +154,39 @@
         </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>
+
       <varlistentry id="grap2graph">
         <term><command>grap2graph</command></term>
         <listitem>
@@ -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>
Index: lfs_xml/chapter06/grub.xml
===================================================================
--- lfs_xml/chapter06/grub.xml	(revision 10973)
+++ lfs_xml/chapter06/grub.xml	(working copy)
@@ -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>
Index: lfs_xml/chapter06/gzip.xml
===================================================================
--- lfs_xml/chapter06/gzip.xml	(revision 10973)
+++ lfs_xml/chapter06/gzip.xml	(working copy)
@@ -71,8 +71,8 @@
       <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>
 
Index: lfs_xml/chapter06/inetutils.xml
===================================================================
--- lfs_xml/chapter06/inetutils.xml	(revision 10973)
+++ lfs_xml/chapter06/inetutils.xml	(working copy)
@@ -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 @@
       <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,6 +143,16 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="dnsdomainname">
+        <term><command>dnsdomainname</command></term>
+        <listitem>
+        <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="ftp">
         <term><command>ftp</command></term>
         <listitem>
@@ -152,6 +163,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="hostname">
+        <term><command>hostname</command></term>
+        <listitem>
+          <para>Reports or sets the name of the host</para>
+          <indexterm zone="ch-system-inetutils hostname">
+            <primary sortas="b-hostname">hostname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="ifconfig">
         <term><command>ifconfig</command></term>
         <listitem>
@@ -162,16 +183,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="hostname">
-        <term><command>hostname</command></term>
-        <listitem>
-          <para>Reports or sets the name of the host</para>
-          <indexterm zone="ch-system-inetutils hostname">
-            <primary sortas="b-hostname">hostname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="ping">
         <term><command>ping</command></term>
         <listitem>
Index: lfs_xml/chapter06/kbd.xml
===================================================================
--- lfs_xml/chapter06/kbd.xml	(revision 10973)
+++ lfs_xml/chapter06/kbd.xml	(working copy)
@@ -133,10 +133,10 @@
         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>
+        <seg>/usr/share/consolefonts, /usr/share/consoletrans, /usr/share/keymaps, 
+        /usr/share/doc/kbd-&kbd-version;,  and /usr/share/unimaps</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -309,16 +309,6 @@
         </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 @@
         </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>
Index: lfs_xml/chapter06/libcap.xml
===================================================================
--- lfs_xml/chapter06/libcap.xml	(revision 10973)
+++ lfs_xml/chapter06/libcap.xml	(working copy)
@@ -91,7 +91,7 @@
 
       <seglistitem>
         <seg>capsh, getcap, getpcaps, and setcap</seg>
-        <seg>libcap.{a,so}</seg>
+        <seg>libcap.so</seg>
       </seglistitem>
     </segmentedlist>
 
Index: lfs_xml/chapter06/libtool.xml
===================================================================
--- lfs_xml/chapter06/libtool.xml	(revision 10973)
+++ lfs_xml/chapter06/libtool.xml	(working copy)
@@ -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>
Index: lfs_xml/chapter06/man-db.xml
===================================================================
--- lfs_xml/chapter06/man-db.xml	(revision 10973)
+++ lfs_xml/chapter06/man-db.xml	(working copy)
@@ -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>
Index: lfs_xml/chapter06/mpc.xml
===================================================================
--- lfs_xml/chapter06/mpc.xml	(revision 10973)
+++ lfs_xml/chapter06/mpc.xml	(working copy)
@@ -73,7 +73,7 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>libmpc.{a,so}</seg>
+        <seg>libmpc.so</seg>
         <seg>/usr/share/doc/mpc-&mpc-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: lfs_xml/chapter06/mpfr.xml
===================================================================
--- lfs_xml/chapter06/mpfr.xml	(revision 10973)
+++ lfs_xml/chapter06/mpfr.xml	(working copy)
@@ -83,7 +83,7 @@
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>libmpfr.{a,so}</seg>
+        <seg>libmpfr.so</seg>
         <seg>/usr/share/doc/mpfr-&mpfr-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: lfs_xml/chapter06/ncurses.xml
===================================================================
--- lfs_xml/chapter06/ncurses.xml	(revision 10973)
+++ lfs_xml/chapter06/ncurses.xml	(working copy)
@@ -174,7 +174,7 @@
            clear, 
            infocmp, 
            infotocap (link to tic),
-           ncursesw5-config, 
+           ncursesw6-config, 
            reset (link to tset), 
            tabs, 
            tic, 
@@ -187,6 +187,7 @@
            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 @@
         </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-ncursesw6-config">ncursesw6-config</primary>
           </indexterm>
         </listitem>
       </varlistentry>
Index: lfs_xml/chapter06/perl.xml
===================================================================
--- lfs_xml/chapter06/perl.xml	(revision 10973)
+++ lfs_xml/chapter06/perl.xml	(working copy)
@@ -135,14 +135,13 @@
       <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 @@
         </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 @@
         </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>
Index: lfs_xml/chapter06/readline.xml
===================================================================
--- lfs_xml/chapter06/readline.xml	(revision 10973)
+++ lfs_xml/chapter06/readline.xml	(working copy)
@@ -105,8 +105,8 @@
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>libhistory.{a,so} and libreadline.{a,so}</seg>
-        <seg>/usr/include/readline, /usr/share/readline, and
+        <seg>libhistory.so and libreadline.so</seg>
+        <seg>/usr/include/readline and
         /usr/share/doc/readline-&readline-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: lfs_xml/chapter06/revisedchroot.xml
===================================================================
--- lfs_xml/chapter06/revisedchroot.xml	(revision 10973)
+++ lfs_xml/chapter06/revisedchroot.xml	(working copy)
@@ -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. -->
 
Index: lfs_xml/chapter06/shadow.xml
===================================================================
--- lfs_xml/chapter06/shadow.xml	(revision 10973)
+++ lfs_xml/chapter06/shadow.xml	(working copy)
@@ -147,7 +147,7 @@
     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 @@
       <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 @@
         </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 @@
         </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>
Index: lfs_xml/chapter06/tar.xml
===================================================================
--- lfs_xml/chapter06/tar.xml	(revision 10973)
+++ lfs_xml/chapter06/tar.xml	(working copy)
@@ -76,11 +76,7 @@
 
 <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 +88,7 @@
       <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 +98,6 @@
       <?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>
Index: lfs_xml/chapter06/texinfo.xml
===================================================================
--- lfs_xml/chapter06/texinfo.xml	(revision 10973)
+++ lfs_xml/chapter06/texinfo.xml	(working copy)
@@ -101,7 +101,7 @@
       <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 @@
         </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>
Index: lfs_xml/chapter06/util-linux.xml
===================================================================
--- lfs_xml/chapter06/util-linux.xml	(revision 10973)
+++ lfs_xml/chapter06/util-linux.xml	(working copy)
@@ -121,18 +121,22 @@
         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 @@
       <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 @@
         </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 @@
         </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>
Index: lfs_xml/chapter07/console.xml
===================================================================
--- lfs_xml/chapter07/console.xml	(revision 10973)
+++ lfs_xml/chapter07/console.xml	(working copy)
@@ -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>
 
Index: lfs_xml/chapter07/udev.xml
===================================================================
--- lfs_xml/chapter07/udev.xml	(revision 10973)
+++ lfs_xml/chapter07/udev.xml	(working copy)
@@ -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>
Index: lfs_xml/chapter08/kernel.xml
===================================================================
--- lfs_xml/chapter08/kernel.xml	(revision 10973)
+++ lfs_xml/chapter08/kernel.xml	(working copy)
@@ -105,7 +105,7 @@
       <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>
Index: lfs_xml/chapter09/reboot.xml
===================================================================
--- lfs_xml/chapter09/reboot.xml	(revision 10973)
+++ lfs_xml/chapter09/reboot.xml	(working copy)
@@ -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>
 
Index: lfs_xml/packages.ent
===================================================================
--- lfs_xml/packages.ent	(revision 10973)
+++ lfs_xml/packages.ent	(working copy)
@@ -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">
@@ -159,10 +159,10 @@
 <!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">
@@ -179,10 +179,10 @@
 <!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">
@@ -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.6">
+<!ENTITY gettext-size "6,718 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "9b7c37e410df4bd1bf854e8c897cf937">
+<!ENTITY gettext-md5 "69d79254ee3b41df23f41c2f4fd720d9">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "153 MB">
 <!ENTITY gettext-ch5-sbu "0.9 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-minor-version "3">
 <!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-size "84,884 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "3d5ea06d767e2f35c999eeadafc76523">
+<!ENTITY linux-md5 "58b35794eee3b6d52ce7be39357801e7">
 <!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,10 +413,10 @@
 <!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">
@@ -475,10 +475,10 @@
 <!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">
@@ -562,16 +562,22 @@
 <!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 udev-lfs-version "udev-lfs-20140408">
+<!ENTITY udev-lfs-size    "11 KB">
+<!ENTITY udev-lfs-url     "&anduin-sources;/&udev-lfs-version;.tar.bz2">
+<!ENTITY udev-lfs-md5     "c2d6b127f89261513b23b6d458484099">
+<!ENTITY udev-lfs-home    " ">
+
+<!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 +601,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">
Index: lfs_xml/patches.ent
===================================================================
--- lfs_xml/patches.ent	(revision 10973)
+++ lfs_xml/patches.ent	(working copy)
@@ -26,6 +26,10 @@
 <!ENTITY glibc-upstream-patch-md5 "cfb3cb46074a833ac5729be79e4f2592">
 <!ENTITY glibc-upstream-patch-size "1.9 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 kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
Index: lfs_xml/pdf-fixups.sh
===================================================================
--- lfs_xml/pdf-fixups.sh	(revision 10973)
+++ lfs_xml/pdf-fixups.sh	(working copy)
@@ -14,3 +14,5 @@
 # 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
Index: lfs_xml/prologue/hostreqs.xml
===================================================================
--- lfs_xml/prologue/hostreqs.xml	(revision 10973)
+++ lfs_xml/prologue/hostreqs.xml	(working copy)
@@ -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 -qv 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
 
Index: lfs_xml/prologue/why.xml
===================================================================
--- lfs_xml/prologue/why.xml	(revision 10973)
+++ lfs_xml/prologue/why.xml	(working copy)
@@ -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>
 
