Index: chapter06/binutils.xml
===================================================================
--- chapter06/binutils.xml	(revision 0376c98feb8d2b4cb0e4dd5f43f177998a138eee)
+++ 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 0376c98feb8d2b4cb0e4dd5f43f177998a138eee)
+++ 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 0376c98feb8d2b4cb0e4dd5f43f177998a138eee)
+++ 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 0376c98feb8d2b4cb0e4dd5f43f177998a138eee)
+++ 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 0376c98feb8d2b4cb0e4dd5f43f177998a138eee)
+++ 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 0376c98feb8d2b4cb0e4dd5f43f177998a138eee)
+++ 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>
