Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ chapter01/changelog.xml	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -37,4 +37,63 @@
 -->
     <listitem>
+      <para>2016-05-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Updated to util-linux-2.28. Merged from trunk
+          r11046.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Simplified gzip instructions. Merged from trunk
+          r11046.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to dejagnu-1.6. Merged from trunk r11048.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Wording change in Chapter 6 GCC. 
+          Merged from trunk r11048.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to file-5.26.
+          Merged from trunk r11049.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gcc-6.1.0.
+          Merged from trunk r11049.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to grep-2.25.
+          Merged from trunk r11049.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gzip-1.8.
+          Merged from trunk r11049.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to linux-4.5.2.
+          Merged from trunk r11049.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to tzdata-2016d.
+          Merged from trunk r11049.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated the binutils upstream fixes patch.
+          Merged from trunk r11049.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Added a patch for glibc which addresses a
+          security issue and build failure with GCC-6.x. Merged from trunk
+          r11049.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Note that configure in texinfo-6.1 incorrectly
+          complains about the --disable-static switch. Merged from trunk
+          r11051.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2016-04-07</para>
       <itemizedlist>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ chapter01/whatsnew.xml	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -59,7 +59,7 @@
       <para>D-Bus-&dbus-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>DejaGNU &dejagnu-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Diffutils &diffutils-version;</para>
@@ -74,7 +74,7 @@
       <para>Expect &expect-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>File &file-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Findutils &findutils-version;</para>
@@ -86,7 +86,7 @@
       <para>Gawk &gawk-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>GCC &gcc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GDBM &gdbm-version;</para>
@@ -209,7 +209,7 @@
       <para>Tzdata &tzdata-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Util-Linux &util-linux-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Vim &vim-version;</para>
@@ -238,17 +238,12 @@
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
-<!--
-    <listitem>
-      <para>&bash-fixes-patch;</para>
-    </listitem>
 
     <listitem>
       <para>&binutils-upstream-patch;</para>
-    </listitem>-->
-<!--
-    <listitem>
-      <para>&gcc-upstream-patch;</para>
-    </listitem>
--->
+    </listitem>
+
+    <listitem>
+      <para>&glibc-upstream-patch;</para>
+    </listitem>
 
   </itemizedlist>
@@ -263,4 +258,8 @@
 
     <listitem>
+      <para>binutils-2.26-upstream_fix-2.patch</para>
+    </listitem>
+
+    <listitem>
       <para>mpfr-3.1.3-upstream_fixes-2.patch</para>
     </listitem>
Index: chapter03/patches.xml
===================================================================
--- chapter03/patches.xml	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ chapter03/patches.xml	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -67,4 +67,12 @@
 
     <varlistentry>
+      <term>Glibc Upstream Patch - <token>&glibc-upstream-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-upstream-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-upstream-patch-md5;</literal></para>
+      </listitem>
+   </varlistentry>
+
+    <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
Index: chapter05/gcc-pass1.xml
===================================================================
--- chapter05/gcc-pass1.xml	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ chapter05/gcc-pass1.xml	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -136,4 +136,5 @@
     --disable-libatomic                            \
     --disable-libgomp                              \
+    --disable-libmpx                               \
     --disable-libquadmath                          \
     --disable-libssp                               \
@@ -196,9 +197,10 @@
       <varlistentry>
         <term><parameter>--disable-decimal-float, --disable-threads,
-        --disable-libatomic, --disable-libgomp, --disable-libquadmath,
-        --disable-libssp, --disable-libvtv, --disable-libstdcxx</parameter></term>
+        --disable-libatomic, --disable-libgomp, --disable-libmpx,
+        --disable-libquadmath, --disable-libssp, --disable-libvtv, 
+        --disable-libstdcxx</parameter></term>
         <listitem>
           <para>These switches disable support for the decimal floating point
-          extension, threading, libatomic, libgomp, libquadmath, libssp,
+          extension, threading, libatomic, libgomp, libmpx, libquadmath, libssp,
           libvtv, and the C++ standard library respectively. These features
           will fail to compile when building a cross-compiler and are not
Index: chapter05/glibc.xml
===================================================================
--- chapter05/glibc.xml	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ chapter05/glibc.xml	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -48,4 +48,9 @@
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
 -->
+
+    <para>Fix some problems identified upstream:</para>
+    
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
+
     <para>The Glibc documentation recommends building Glibc 
     in a dedicated build directory:</para>
Index: chapter06/binutils.xml
===================================================================
--- chapter06/binutils.xml	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ chapter06/binutils.xml	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -58,5 +58,5 @@
 Ask your system administrator to create more.</computeroutput></screen>
 
-    <para>Fix a problem identified upstream:</para>
+    <para>Fix some problems identified upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&binutils-upstream-patch;</userinput></screen>
@@ -107,5 +107,5 @@
     <para>Test the results:</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="test">make -k check</userinput></screen>
 
     <para> The test 'Link with zlib-gabi compressed debug output' is known to fail.</para>
Index: chapter06/gcc.xml
===================================================================
--- chapter06/gcc.xml	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ chapter06/gcc.xml	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -42,8 +42,4 @@
     <title>Installation of GCC</title>
 
-<!--    <para>First apply some fixes from the upstream repository:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen> -->
-
     <para>The GCC documentation recommends building GCC in a dedicated build directory:</para>
 
@@ -124,7 +120,7 @@
 <screen><userinput remap="install">make install</userinput></screen>
 
-    <para>Some packages expect the C preprocessor to be installed in the
-    <filename class="directory">/lib</filename> directory.
-    To support those packages, create this symlink:</para>
+    <para>Create a symlink required by the <ulink
+    url="http://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s09.html">FHS</ulink>
+    for "historical" reasons.</para>
 
 <screen><userinput remap="install">ln -sv ../usr/bin/cpp /lib</userinput></screen>
Index: chapter06/glibc.xml
===================================================================
--- chapter06/glibc.xml	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ chapter06/glibc.xml	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -69,4 +69,9 @@
  
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen> 
+
+    <para>Fix some problems identified upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
+
     <para>The Glibc build system is self-contained and will install
     perfectly, even though the compiler specs file and linker are still
Index: chapter06/gzip.xml
===================================================================
--- chapter06/gzip.xml	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ chapter06/gzip.xml	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -44,5 +44,5 @@
     <para>Prepare Gzip for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
 
     <para>Compile the package:</para>
Index: chapter06/pkgconfig.xml
===================================================================
--- chapter06/pkgconfig.xml	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ chapter06/pkgconfig.xml	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -47,4 +47,5 @@
 <screen><userinput remap="configure">./configure --prefix=/usr        \
             --with-internal-glib \
+            --disable-compile-warnings \
             --disable-host-tool  \
             --docdir=/usr/share/doc/pkg-config-&pkgconfig-version;</userinput></screen>
@@ -58,4 +59,13 @@
           <para>This will allow pkg-config to use its internal version of
           Glib because an external version is not available in LFS.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--disable-compile-warnings</parameter></term>
+        <listitem>
+          <para>This option prevents the build system from using
+          compiler flags which cause build failure when building
+          with GCC 6.</para>
         </listitem>
       </varlistentry>
Index: chapter06/texinfo.xml
===================================================================
--- chapter06/texinfo.xml	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ chapter06/texinfo.xml	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -45,4 +45,20 @@
 
 <screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+      
+      <varlistentry>
+        <term><parameter>--disable-static</parameter></term>
+        <listitem>
+          <para>In this case, the top-level configure script will complain that
+          this is an unrecognized option, but the configure script for
+          XSParagraph recognizes it and uses it to disable installing a static
+          <filename class="libraryfile">XSParagraph.a</filename> to <filename
+          class="directory">/usr/lib/texinfo</filename>.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <para>Compile the package:</para>
Index: general.ent
===================================================================
--- general.ent	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ general.ent	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -1,5 +1,5 @@
-<!ENTITY version         "20160407-systemd">
+<!ENTITY version         "20160506-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "April 7th, 2016">
+<!ENTITY releasedate     "May 6th, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.10">
Index: packages.ent
===================================================================
--- packages.ent	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ packages.ent	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -115,8 +115,8 @@
 <!ENTITY dbus-ch6-sbu "0.2 SBU">
 
-<!ENTITY dejagnu-version "1.5.3">
-<!ENTITY dejagnu-size "584 KB">
+<!ENTITY dejagnu-version "1.6">
+<!ENTITY dejagnu-size "512 KB">
 <!ENTITY dejagnu-url "&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz">
-<!ENTITY dejagnu-md5 "5bda2cdb1af51a80aecce58d6e42bd2f">
+<!ENTITY dejagnu-md5 "1fdc2eb0d592c4f89d82d24dfdf02f0b">
 <!ENTITY dejagnu-home "&gnu-software;dejagnu/">
 <!ENTITY dejagnu-ch5-du "4.2 MB">
@@ -161,12 +161,12 @@
 <!ENTITY expect-ch5-sbu "less than 0.1 SBU">
 
-<!ENTITY file-version "5.25">
-<!ENTITY file-size "723 KB">
+<!ENTITY file-version "5.26">
+<!ENTITY file-size "756 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "e6a972d4e10d9e76407a432f4a63cd4c">
+<!ENTITY file-md5 "bdd12400b90b78ce3c57e79c8d4e0e17">
 <!ENTITY file-home "http://www.darwinsys.com/file/">
-<!ENTITY file-ch5-du "14 MB">
+<!ENTITY file-ch5-du "15 MB">
 <!ENTITY file-ch5-sbu "less than 0.1 SBU">
-<!ENTITY file-ch6-du "14 MB">
+<!ENTITY file-ch6-du "15 MB">
 <!ENTITY file-ch6-sbu "less than 0.1 SBU">
 
@@ -199,17 +199,17 @@
 <!ENTITY gawk-ch6-sbu "0.3 SBU">
 
-<!ENTITY gcc-version "5.3.0">
-<!ENTITY gcc-size "93,205 KB">
+<!ENTITY gcc-version "6.1.0">
+<!ENTITY gcc-size "96,944 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "c9616fd448f980259c31de613e575719">
+<!ENTITY gcc-md5 "8fb6cb98b8459f5863328380fbf06bd1">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
-<!ENTITY gcc-ch5p1-du "2.4 GB">
-<!ENTITY gcc-ch5p1-sbu "8.2 SBU">
-<!ENTITY gcc-ch5p2-du "2.8 GB">
-<!ENTITY gcc-ch5p2-sbu "10.5 SBU">
-<!ENTITY gcc-ch6-du "3.2 GB ">
-<!ENTITY gcc-ch6-sbu "91.2 SBU (with tests)">
-
-<!ENTITY libstdcpp-ch5-du "860 MB">
+<!ENTITY gcc-ch5p1-du "2.8 GB">
+<!ENTITY gcc-ch5p1-sbu "7.0 SBU">
+<!ENTITY gcc-ch5p2-du "3.2 GB">
+<!ENTITY gcc-ch5p2-sbu "9.1 SBU">
+<!ENTITY gcc-ch6-du "3.7 GB ">
+<!ENTITY gcc-ch6-sbu "71 SBU (with tests)">
+
+<!ENTITY libstdcpp-ch5-du "893 MB">
 <!ENTITY libstdcpp-ch5-sbu "0.4 SBU">
 
@@ -259,12 +259,12 @@
 <!ENTITY gperf-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY grep-version "2.24">
-<!ENTITY grep-size "1,291 KB">
+<!ENTITY grep-version "2.25">
+<!ENTITY grep-size "712 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "f1c980134c04692a90078e87283074b6">
+<!ENTITY grep-md5 "04e96b0e6f0fe6a180ae62c88fcd0af6">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-ch5-du "19 MB">
 <!ENTITY grep-ch5-sbu "0.2 SBU">
-<!ENTITY grep-ch6-du "29 MB">
+<!ENTITY grep-ch6-du "29.5 MB">
 <!ENTITY grep-ch6-sbu "0.4 SBU">
 
@@ -285,12 +285,12 @@
 <!ENTITY grub-ch6-sbu "0.8 SBU">
 
-<!ENTITY gzip-version "1.7">
-<!ENTITY gzip-size "747 KB">
+<!ENTITY gzip-version "1.8">
+<!ENTITY gzip-size "712 KB">
 <!ENTITY gzip-url "&gnu;gzip/gzip-&gzip-version;.tar.xz">
-<!ENTITY gzip-md5 "d9ae97206a703a20e6c1c868deb3eb47">
+<!ENTITY gzip-md5 "f7caabb65cddc1a4165b398009bd05b9">
 <!ENTITY gzip-home "&gnu-software;gzip/">
-<!ENTITY gzip-ch5-du "10 MB">
+<!ENTITY gzip-ch5-du "9.2 MB">
 <!ENTITY gzip-ch5-sbu "0.1 SBU">
-<!ENTITY gzip-ch6-du "20 MB">
+<!ENTITY gzip-ch6-du "19 MB">
 <!ENTITY gzip-ch6-sbu "0.2 SBU">
 
@@ -377,10 +377,10 @@
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "5">
-<!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 "85,304 KB">
+<!ENTITY linux-patch-version "2">
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
+<!ENTITY linux-size "86,324 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "a60d48eee08ec0536d5efb17ca819aef">
+<!ENTITY linux-md5 "eae8f700463ea73185027caece5f1c5d">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
@@ -390,7 +390,7 @@
 <!ENTITY linux-ch8-sbu "3.0 - 49.0 SBU (typically about 6 SBU)">
 
-<!ENTITY linux-headers-ch5-du "727 MB">
+<!ENTITY linux-headers-ch5-du "728 MB">
 <!ENTITY linux-headers-ch5-sbu "0.1 SBU">
-<!ENTITY linux-headers-ch6-du "732 MB">
+<!ENTITY linux-headers-ch6-du "734 MB">
 <!ENTITY linux-headers-ch6-sbu "0.1 SBU">
 
@@ -564,14 +564,14 @@
 <!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
-<!ENTITY tzdata-version "2016c">
-<!ENTITY tzdata-size "302 KB">
+<!ENTITY tzdata-version "2016d">
+<!ENTITY tzdata-size "308 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "0330ccd16140d3b6438a18dae9b34b93">
+<!ENTITY tzdata-md5 "14bf84b6c2cdab0a9428991e0150ebe6">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 
-<!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 "3cd2698d1363a2c64091c2dadc974647">
+<!ENTITY util-linux-version "2.28">
+<!ENTITY util-linux-size "4,042 KB">
+<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.28/util-linux-&util-linux-version;.tar.xz">
+<!ENTITY util-linux-md5 "e534e6ccc49107e5d31c329af798ef7d">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-ch5-du "120 MB">
Index: patches.ent
===================================================================
--- patches.ent	(revision ed17c23b023ba2957aca66c5611b08d90cca86d6)
+++ patches.ent	(revision 9d5d854fca2972e157b86214e6404c8633fe5886)
@@ -11,7 +11,7 @@
 <!ENTITY bc-memory-leak-patch-size "1.4 KB">
 
-<!ENTITY binutils-upstream-patch "binutils-&binutils-version;-upstream_fix-2.patch">
-<!ENTITY binutils-upstream-patch-md5 "33662839ab819acb58796c4c2db20631">
-<!ENTITY binutils-upstream-patch-size "13 KB">
+<!ENTITY binutils-upstream-patch "binutils-&binutils-version;-upstream_fixes-3.patch">
+<!ENTITY binutils-upstream-patch-md5 "a595deb0713739b75bc78cb225fa910d">
+<!ENTITY binutils-upstream-patch-size "29 KB">
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
@@ -27,4 +27,8 @@
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
 
+<!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_fixes-1.patch">
+<!ENTITY glibc-upstream-patch-md5 "e602b6c3a332f4a06e2914e02ae2b295">
+<!ENTITY glibc-upstream-patch-size "16 KB">
+
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
