diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index e783d1883..fece3969f 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -171,7 +171,6 @@ cd       build</userinput></screen>
     --disable-threads                              \
     --disable-libatomic                            \
     --disable-libgomp                              \
-    --disable-libmpx                               \
     --disable-libquadmath                          \
     --disable-libssp                               \
     --disable-libvtv                               \
@@ -198,7 +197,6 @@ cd       build</userinput></screen>
     --disable-threads                              \
     --disable-libatomic                            \
     --disable-libgomp                              \
-    --disable-libmpx                               \
     --disable-libquadmath                          \
     --disable-libssp                               \
     --disable-libvtv                               \
@@ -262,12 +260,12 @@ cd       build</userinput></screen>
 
       <varlistentry>
         <term><parameter>--disable-decimal-float, --disable-threads,
-        --disable-libatomic, --disable-libgomp, --disable-libmpx,
+              --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, libmpx, 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
           necessary for the task of cross-compiling the temporary libc.</para>
diff --git a/chapter06/check.xml b/chapter06/check.xml
index c65e8033d..5374de5c1 100644
--- a/chapter06/check.xml
+++ b/chapter06/check.xml
@@ -42,7 +42,8 @@
 
     <para>Prepare Check for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr \
+            --docdir=/usr/share/doc/check-&check-version;</userinput></screen>
 
     <para>Build the package:</para>
 
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index fc2ea82f3..42ea98b0d 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -100,7 +100,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
 
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">FORCE_UNSAFE_CONFIGURE=1 make</userinput></screen>
+<screen><userinput remap="make">make</userinput></screen>
 
     <para>Skip down to <quote>Install the
     package</quote> if not running the test suite.</para>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index fcdd4b392..0ac6353af 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -81,7 +81,6 @@ cd       build</userinput></screen>
              --enable-languages=c,c++ \
              --disable-multilib       \
              --disable-bootstrap      \
-             --disable-libmpx         \
              --with-system-zlib</userinput></screen>
 <screen arch="ml_32"><userinput remap="configure">SED=sed                               \
 ../configure --prefix=/usr                     \
@@ -89,7 +88,6 @@ cd       build</userinput></screen>
              --enable-multilib                 \
              --with-multilib-list=m32,m64      \
              --disable-bootstrap               \
-             --disable-libmpx                  \
              --with-system-zlib</userinput></screen>
 <screen arch="ml_x32"><userinput remap="configure">SED=sed                               \
 ../configure --prefix=/usr                     \
@@ -97,7 +95,6 @@ cd       build</userinput></screen>
              --enable-multilib                 \
              --with-multilib-list=mx32,m64     \
              --disable-bootstrap               \
-             --disable-libmpx                  \
              --with-system-zlib</userinput></screen>
 <screen arch="ml_all"><userinput remap="configure">SED=sed                               \
 ../configure --prefix=/usr                     \
@@ -105,7 +102,6 @@ cd       build</userinput></screen>
              --enable-multilib                 \
              --with-multilib-list=m32,mx32,m64 \
              --disable-bootstrap               \
-             --disable-libmpx                  \
              --with-system-zlib</userinput></screen>
 
     <para>Note that for other languages, there are some prerequisites that
@@ -123,16 +119,16 @@ cd       build</userinput></screen>
           path to /tools/bin/sed.</para>
         </listitem>
       </varlistentry>
- 
+      <!-- 
       <varlistentry>
-        <term><parameter>--disable-libmpx</parameter></term>
+        <term><parameter>- -disable-libmpx</parameter></term>
         <listitem>
           <para>This switch tells GCC to not build mpx (Memory Protection
           Extensions) that can cause problems on some processors. It has
           been removed from the next version of gcc.</para>
         </listitem>
       </varlistentry>
-
+      -->
       <varlistentry>
         <term><parameter>--with-system-zlib</parameter></term>
         <listitem>
@@ -156,10 +152,6 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="test">ulimit -s 32768</userinput></screen>
 
-    <para>Remove one test known to cause a problem:</para>
-
-<screen><userinput remap="test">rm ../gcc/testsuite/g++.dg/pr83239.C</userinput></screen>
-
     <para>Test the results as a non-privileged user, but do not stop at errors:</para>
 
 <screen><userinput remap="test">chown -Rv nobody . 
@@ -179,6 +171,12 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
     <para>Six tests related to get_time are known to fail.  These are
     apparantly related to the en_HK locale.</para>
 
+    <para>Two tests named lookup.cc and reverse.cc in experimental/net
+    are known to fail in LFS chroot environment because they require
+    /etc/hosts and iana-etc.</para>
+
+    <para>Two tests named pr57193.c and pr90178.c are known to fail.</para>
+
     <para>A few unexpected failures cannot always be avoided. The GCC developers
     are usually aware of these issues, but have not resolved them yet.
     Unless the test results are vastly different from those at the above URL,
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index faa774bdf..a3a11fb6e 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -52,7 +52,7 @@
     <para>Because we have not yet installed the final version of Util-Linux,
     create links to the libraries in the approprite location:</para>
 
-<screen><userinput remap="pre">for file in /tools/lib/lib{blkid,mount,uuid}*; do
+<screen><userinput remap="pre">for file in /tools/lib/lib{blkid,mount,uuid}.so*; do
     ln -sf $file /usr/lib/
 done</userinput></screen>
 
diff --git a/packages.ent b/packages.ent
index 14227e852..ddd436430 100644
--- a/packages.ent
+++ b/packages.ent
@@ -234,7 +234,7 @@
 <!ENTITY gcc-ch6-du "3.9 GB ">
 <!ENTITY gcc-ch6-sbu "92 SBU (with tests)">
 <!ENTITY libquadmath-version "0.0.0">
-<!ENTITY libstdcpp-version   "6.0.25">
+<!ENTITY libstdcpp-version   "6.0.26">
 <!ENTITY libitm-version      "1.0.0">
 <!ENTITY libatomic-version   "1.2.0">
 <!ENTITY libmpx-version      "2.0.1">