Sync with latest trunk updates

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10255 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

25 files changed, 567 insertions, 344 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 209ef985a..c39e80511 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,196 @@
 -->
 
     <listitem>
+      <para>2013-04-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Linux-3.8.10. Fixes
+          <ulink url="&lfs-ticket-root;3335">#3335</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-04-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to less-458. Fixes
+          <ulink url="&lfs-ticket-root;3333">#3334</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Upgrade to util-linux-2.23. Fixes
+          <ulink url="&lfs-ticket-root;3311">#3311</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-04-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Libpipeline-1.2.3. Fixes
+          <ulink url="&lfs-ticket-root;3333">#3333</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Tzdata-2013c. Fixes
+          <ulink url="&lfs-ticket-root;3332">#3332</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Man-Pages-3.51. Fixes
+          <ulink url="&lfs-ticket-root;3331">#3331</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Check-0.9.10. Fixes
+          <ulink url="&lfs-ticket-root;3330">#3330</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-04-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Use default locations for kbd files 
+          because custom locations are no longer needed by the
+          boot scripts.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-04-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to udev-202 (systemd-202). Fixes
+          <ulink url="&lfs-ticket-root;3329">#3329</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-04-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to Linux-3.8.8. Fixes
+          <ulink url="&lfs-ticket-root;3322">#3322</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Kmod-13. Fixes
+          <ulink url="&lfs-ticket-root;3324">#3324</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Bison-2.7.1. Fixes
+          <ulink url="&lfs-ticket-root;3327">#3327</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-04-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update list of installed libraries in GMP.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to udev-201 (systemd-201).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-04-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Fix a failure in the procps-ng test suite.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-04-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to Linux-3.8.5. Fixes
+          <ulink url="&lfs-ticket-root;3320">#3320</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Upgrade to Systemd-200. Fixes
+          <ulink url="&lfs-ticket-root;3317">#3317</ulink> and
+          <ulink url="&lfs-ticket-root;3321">#3321</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Expand tcl space for regular expressions
+          needed for some tests.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Disable a g++ libmudflap test that always
+          fails.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-03-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Remove notes about enabling LTO support; both GCC
+          and Binutils enable it by default now.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Add texinfo related seds to Binutils pass1 and pass2
+          as hosts may have a new enough version of Texinfo to cause
+          issues.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Use --disable-install-libiberty to prevent GCC from
+          installing libiberty.a (thanks to Armin K. for the pointer).  Retain
+          the existing sed, though, as the flag doesn't work correctly
+          yet.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Remove the now unnecessary instructions that
+          prevented GCC's info files from being built; GCC-4.8.0 contains
+          upstream fixes.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-03-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Binutils-2.23.2. Fixes
+          <ulink url="&lfs-ticket-root;3318">#3318</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Systemd-199. Fixes
+          <ulink url="&lfs-ticket-root;3317">#3317</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Procps-NG-3.3.7. Fixes
+          <ulink url="&lfs-ticket-root;3316">#3316</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Diffutils-3.3. Fixes
+          <ulink url="&lfs-ticket-root;3315">#3315</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to File-5.14. Fixes
+          <ulink url="&lfs-ticket-root;3313">#3313</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to GCC-4.8.0. Fixes
+          <ulink url="&lfs-ticket-root;3312">#3312</ulink>. Thanks to Pierre
+          Labastie for the patch on which this was based.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Linux-3.8.4. Fixes
+          <ulink url="&lfs-ticket-root;3310">#3310</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-03-24</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 71c9dc37c..18f83cfcb 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -28,9 +28,9 @@
     <!--<listitem>
       <para>Autoconf &autoconf-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Automake &automake-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
@@ -49,54 +49,54 @@
     <listitem>
       <para>Check &check-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>Coreutils &coreutils-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>DejaGNU &dejagnu-version;</para>
     </listitem>
-    <!--<listitem>
-      <para>Diffutils &diffutils-version;</para>
-    </listitem>-->
     <listitem>
-      <para>E2fsprogs &e2fsprogs-version;</para>
+      <para>Diffutils &diffutils-version;</para>
     </listitem>
     <!--<listitem>
-      <para>Expect &expect-version;</para>
+      <para>E2fsprogs &e2fsprogs-version;</para>
     </listitem>-->
     <!--<listitem>
-      <para>File &file-version;</para>
+      <para>Expect &expect-version;</para>
     </listitem>-->
+    <listitem>
+      <para>File &file-version;</para>
+    </listitem>
     <!--<listitem>
       <para>Findutils &findutils-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Flex &flex-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Gawk &gawk-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>GCC &gcc-version;</para>
     </listitem>
     <!--<listitem>
       <para>GDBM &gdbm-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Gettext &gettext-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Glibc &glibc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>GMP &gmp-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Grep &grep-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Groff &groff-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>GRUB &grub-version;</para>
     </listitem>-->
@@ -109,12 +109,12 @@
     <!--<listitem>
       <para>Inetutils &inetutils-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>IPRoute2 &iproute2-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Kbd &kbd-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Kmod &kmod-version;</para>
     </listitem>
@@ -139,42 +139,42 @@
     <!--<listitem>
       <para>Make &make-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Man-DB &man-db-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Man-pages &man-pages-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>MPC &mpc-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>MPFR &mpfr-version;</para>
     </listitem>
     <!--<listitem>
       <para>Ncurses &ncurses-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Patch &patch-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Perl &perl-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>Pkg-config &pkgconfig-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Procps-ng &procps-ng-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>Psmisc &psmisc-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Readline &readline-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Sed &sed-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Shadow &shadow-version;</para>
     </listitem>-->
@@ -187,18 +187,15 @@
     <!--<listitem>
       <para>Tar &tar-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>TCL &tcl-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Texinfo &texinfo-version;</para>
     </listitem>
     <listitem>
       <para>Tzdata &tzdata-version;</para>
     </listitem>
-    <listitem>
-      <para>Udev &systemd-version; (extracted from systemd-&systemd-version;)</para>
-    </listitem>
     <!--<listitem>
       <para>&udev-config;</para>
     </listitem>-->
@@ -237,17 +234,9 @@
     </listitem>
 
     <listitem>
-      <para>&binutils-testsuite-fixes-patch;</para>
-    </listitem>
-
-    <listitem>
       <para>&coreutils-i18n-patch;</para>
     </listitem>
-<!--
-    <listitem>
-      <para>&coreutils-test-patch;</para>
-    </listitem>
--->
+
     <listitem>
       <para>D-Bus-&dbus-version;</para>
     </listitem>
@@ -277,15 +266,15 @@
     </listitem>
 
     <listitem>
-      <para>Systemd-&systemd-version;</para>
+      <para>&perl-libc-patch;</para>
     </listitem>
 
     <listitem>
-      <para>XML-Parser-&xml-parser-version;</para>
+      <para>Systemd-&systemd-version;</para>
     </listitem>
 
     <listitem>
-      <para>&perl-libc-patch;</para>
+      <para>XML-Parser-&xml-parser-version;</para>
     </listitem>
 
   </itemizedlist>
@@ -298,55 +287,11 @@
     </listitem>
 
     <listitem>
-      <para>binutils-2.22-build_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>coreutils-8.19-i18n-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>gcc-4.7.1-startfiles_fix-1.patch</para>
+      <para>binutils-2.23.1-testsuite_fix-1.patch</para>
     </listitem>
 
     <listitem>
-      <para>glibc-2.16.0-fix_test_installation-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>glibc-2.16.0-res_query_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>kbd-1.15.3-backspace-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>kbd-1.15.3-upstream_fixes-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>kmod-9-testsuite-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>make-3.82-upstream_fixes-2.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>patch-2.6.1-test_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>procps-3.2.8-fix_HZ_errors-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>procps-3.2.8-watch_unicode-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>sed-4.2.1-testsuite_fixes-1.patch</para>
+      <para>perl-5.16.2-libc-1.patch</para>
     </listitem>
 
     <listitem>
@@ -357,10 +302,6 @@
       <para>Udev-197</para>
     </listitem>
 
-    <listitem>
-      <para>perl-5.16.2-libc-1.patch</para>
-    </listitem>
-
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 83faa250c..ff269dfaf 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -27,14 +27,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Binutils Test Suite Patch - <token>&binutils-testsuite-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&binutils-testsuite-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&binutils-testsuite-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&bzip2-docs-patch;"/></para>
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index decec8b6f..8a4880b46 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -52,6 +52,12 @@
     linker and assembler to determine which of their own features to
     enable.</para>
 
+    <para>Fix a couple of syntax errors that prevent the documentation from
+    building with Texinfo-&texinfo-version;:</para>
+
+<screen><userinput remap="pre">sed -i -e 's/@colophon/@@colophon/' \
+       -e 's/doc@cygnus.com/doc@@cygnus.com/' bfd/doc/bfd.texinfo</userinput></screen>
+
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
 
@@ -72,7 +78,7 @@ cd ../binutils-build</userinput></screen>
 
     <para>Now prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure     \
+<screen><userinput remap="configure">../binutils-&binutils-version;/configure   \
     --prefix=/tools            \
     --with-sysroot=$LFS        \
     --with-lib-path=/tools/lib \
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 1cac61a18..4d661296c 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -43,6 +43,12 @@
   <sect2 role="installation">
     <title>Installation of Binutils</title>
 
+    <para>Fix a couple of syntax errors that prevent the documentation from
+    building with Texinfo-&texinfo-version;:</para>
+
+<screen><userinput remap="pre">sed -i -e 's/@colophon/@@colophon/' \
+       -e 's/doc@cygnus.com/doc@@cygnus.com/' bfd/doc/bfd.texinfo</userinput></screen>
+
     <para>Create a separate build directory again:</para>
 
 <screen><userinput remap="pre">mkdir -v ../binutils-build
@@ -50,12 +56,12 @@ cd ../binutils-build</userinput></screen>
 
     <para>Prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">CC=$LFS_TGT-gcc            \
-AR=$LFS_TGT-ar             \
-RANLIB=$LFS_TGT-ranlib     \
-../binutils-&binutils-version;/configure \
-    --prefix=/tools        \
-    --disable-nls          \
+<screen><userinput remap="configure">CC=$LFS_TGT-gcc                \
+AR=$LFS_TGT-ar                 \
+RANLIB=$LFS_TGT-ranlib         \
+../binutils-&binutils-version;/configure   \
+    --prefix=/tools            \
+    --disable-nls              \
     --with-lib-path=/tools/lib \
     --with-sysroot</userinput></screen>
 
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index d6a977d48..d858c9a98 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -18,6 +18,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc-pass1.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstdc++.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils-pass2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc-pass2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml
index 94ec7c49c..62ba35874 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -43,10 +43,6 @@
   <sect2 role="installation">
     <title>Installation of Diffutils</title>
 
-    <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para>
-
-<screen><userinput remap="pre">sed -i -e '/gets is a/d' lib/stdio.in.h</userinput></screen>
-
     <para>Prepare Diffutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index bf8076d1b..23c7fe7e8 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -105,11 +105,6 @@ done</userinput></screen>
 
 <screen><userinput remap="pre">sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure</userinput></screen>
 
-    <para>Do not build the .info files.  They are not needed here and 
-    are broken with the current version of <command>makeinfo</command>.</para>
-
-<screen><userinput remap="pre">sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure</userinput></screen>
-
     <para>The GCC documentation recommends building GCC outside of the
     source directory in a dedicated build directory:</para>
 
@@ -118,24 +113,28 @@ cd ../gcc-build</userinput></screen>
 
     <para>Prepare GCC for compilation:</para>
 
-<screen><userinput remap="configure">../gcc-&gcc-version;/configure         \
-    --target=$LFS_TGT          \
-    --prefix=/tools            \
-    --with-sysroot=$LFS        \
-    --with-newlib              \
-    --without-headers          \
-    --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include \
-    --disable-nls              \
-    --disable-shared           \
-    --disable-multilib         \
-    --disable-decimal-float    \
-    --disable-threads          \
-    --disable-libmudflap       \
-    --disable-libssp           \
-    --disable-libgomp          \
-    --disable-libquadmath      \
-    --enable-languages=c       \
+<screen><userinput remap="configure">../gcc-&gcc-version;/configure                               \
+    --target=$LFS_TGT                                \
+    --prefix=/tools                                  \
+    --with-sysroot=$LFS                              \
+    --with-newlib                                    \
+    --without-headers                                \
+    --with-local-prefix=/tools                       \
+    --with-native-system-header-dir=/tools/include   \
+    --disable-nls                                    \
+    --disable-shared                                 \
+    --disable-multilib                               \
+    --disable-decimal-float                          \
+    --disable-threads                                \
+    --disable-libatomic                              \
+    --disable-libgomp                                \
+    --disable-libitm                                 \
+    --disable-libmudflap                             \
+    --disable-libquadmath                            \
+    --disable-libsanitizer                           \
+    --disable-libssp                                 \
+    --disable-libstdc++-v3                           \
+    --enable-languages=c,c++                         \
     --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
     --with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
 
@@ -193,10 +192,14 @@ cd ../gcc-build</userinput></screen>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--disable-decimal-float, --disable-threads, --disable-libmudflap, --disable-libssp, --disable-libgomp, --disable-libquadmath</parameter></term>
+        <term><parameter>--disable-decimal-float, --disable-threads,
+        --disable-libatomic, --disable-libgomp, --disable-libitm,
+        --disable-libmudflap, --disable-libquadmath, --disable-libsanitizer,
+        --disable-libssp, --disable-libstdc++-v3</parameter></term>
         <listitem>
           <para>These switches disable support for the decimal floating point
-          extension, threading, libmudflap, libssp and libgomp and libquadmath
+          extension, threading, libatomic, libgomp, libitm, libmudflap,
+          libquadmath, libsanitizer, libssp 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>
@@ -212,10 +215,10 @@ cd ../gcc-build</userinput></screen>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--enable-languages=c</parameter></term>
+        <term><parameter>--enable-languages=c,c++</parameter></term>
         <listitem>
-          <para>This option ensures that only the C compiler is built.
-          This is the only language needed now.</para>
+          <para>This option ensures that only the C and C++ compilers are built.
+          These are the only languages needed now.</para>
         </listitem>
       </varlistentry>
 
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 6e7631741..a370daf71 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -97,11 +97,6 @@ mv -v gmp-&gmp-version; gmp
 tar -zxf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
-    <para>Again, do not build the .info files.  They are not needed here and
-    are broken with the current version of <command>makeinfo</command>.</para>
-
-    <screen><userinput remap="pre">sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure</userinput></screen>
-
     <para>Create a separate build directory again:</para>
 
 <screen><userinput remap="pre">mkdir -v ../gcc-build
@@ -112,22 +107,24 @@ cd ../gcc-build</userinput></screen>
 
     <para>Now prepare GCC for compilation:</para>
 
-<screen><userinput remap="configure">CC=$LFS_TGT-gcc \
-AR=$LFS_TGT-ar                  \
-RANLIB=$LFS_TGT-ranlib          \
-../gcc-&gcc-version;/configure          \
-    --prefix=/tools             \
-    --with-local-prefix=/tools  \
-    --with-native-system-header-dir=/tools/include \
-    --enable-clocale=gnu        \
-    --enable-shared             \
-    --enable-threads=posix      \
-    --enable-__cxa_atexit       \
-    --enable-languages=c,c++    \
-    --disable-libstdcxx-pch     \
-    --disable-multilib          \
-    --disable-bootstrap         \
-    --disable-libgomp           \
+<screen><userinput remap="configure">
+CC=$LFS_TGT-gcc                                      \
+CXX=$LFS_TGT-g++                                     \
+AR=$LFS_TGT-ar                                       \
+RANLIB=$LFS_TGT-ranlib                               \
+../gcc-&gcc-version;/configure                               \
+    --prefix=/tools                                  \
+    --with-local-prefix=/tools                       \
+    --with-native-system-header-dir=/tools/include   \
+    --enable-clocale=gnu                             \
+    --enable-shared                                  \
+    --enable-threads=posix                           \
+    --enable-__cxa_atexit                            \
+    --enable-languages=c,c++                         \
+    --disable-libstdcxx-pch                          \
+    --disable-multilib                               \
+    --disable-bootstrap                              \
+    --disable-libgomp                                \
     --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
     --with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
 
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 642532c87..b774e2d03 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -76,14 +76,14 @@ esac</userinput></screen>
     <para>Next, prepare Glibc for compilation:</para>
 
 <screen><userinput remap="configure">../glibc-&glibc-version;/configure                             \
-      --prefix=/tools                                 \
-      --host=$LFS_TGT                                 \
+      --prefix=/tools                               \
+      --host=$LFS_TGT                               \
       --build=$(../glibc-&glibc-version;/scripts/config.guess) \
-      --disable-profile                               \
-      --enable-kernel=2.6.25                          \
-      --with-headers=/tools/include                   \
-      libc_cv_forced_unwind=yes                       \
-      libc_cv_ctors_header=yes                        \
+      --disable-profile                             \
+      --enable-kernel=2.6.25                        \
+      --with-headers=/tools/include                 \
+      libc_cv_forced_unwind=yes                     \
+      libc_cv_ctors_header=yes                      \
       libc_cv_c_cleanup=yes</userinput></screen>
 
     <variablelist>
diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
new file mode 100644
index 000000000..02c4a05db
--- /dev/null
+++ b/chapter05/libstdc++.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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;
+]>
+
+<sect1 id="ch-tools-libstdcpp" role="wrap">
+  <?dbhtml filename="gcc-libstdc++.html"?>
+
+  <sect1info condition="script">
+    <productname>libstdc++</productname>
+    <productnumber>&gcc-version;</productnumber>
+    <address>&gcc-url;</address>
+  </sect1info>
+
+  <title>Libstdc++-&gcc-version;</title>
+
+  <indexterm zone="ch-tools-libstdcpp">
+    <primary sortas="a-GCC">GCC</primary>
+    <secondary>tools, libstdc++</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Libstdc++ is the standard C++ library. It is needed for the correct
+    operation of the g++ compiler.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&libstdcpp-ch5-sbu;</seg>
+        <seg>&libstdcpp-ch5-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Target Libstdc++</title>
+
+    <note>
+      <para><application>Libstdc++</application> is part of the GCC sources.
+      You should first unpack the GCC tarball and change to the
+      <filename>gcc-&gcc-version;</filename> directory.</para>
+    </note>
+
+    <para>Create a directory for Libstdc++ and enter it:</para>
+
+<screen><userinput remap="pre">mkdir -pv ../gcc-build
+cd ../gcc-build</userinput></screen>
+
+    <para>Prepare Libstdc++ for compilation:</para>
+
+<screen><userinput remap="configure">../gcc-&gcc-version;/libstdc++-v3/configure \
+    --host=$LFS_TGT                      \
+    --prefix=/tools                      \
+    --disable-multilib                   \
+    --disable-shared                     \
+    --disable-nls                        \
+    --disable-libstdcxx-threads          \
+    --disable-libstdcxx-pch              \
+    --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--host=...</parameter></term>
+        <listitem>
+          <para>Indicates to use the cross compiler we have just built
+          instead of the one in <filename>/usr/bin</filename>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--disable-libstdcxx-threads</parameter></term>
+        <listitem>
+          <para>Since we have not built the thread C library, the C++
+          one cannot be built as well.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--disable-libstdcxx-pch</parameter></term>
+        <listitem>
+          <para>This switch prevents the installation of precompiled
+          include files, which are not needed at this stage.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-gxx-include-dir=/tools/include/c++/&gcc-version;</parameter></term>
+        <listitem>
+          <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
+          must be explicitely given.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para>Compile libstdc++ by running:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the library:</para>
+
+<screen><userinput remap="install">make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in
+    <xref linkend="contents-gcc" role="."/></para>
+
+  </sect2>
+
+</sect1>
diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml
index 1a58b1dbb..624e23d9f 100644
--- a/chapter06/adjusting.xml
+++ b/chapter06/adjusting.xml
@@ -30,9 +30,9 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
   so that GCC knows where to find the correct headers and Glibc start files.
   A <command>sed</command> command accomplishes this:</para>
 
-<screen><userinput>gcc -dumpspecs | sed -e 's@/tools@@g' \
+<screen><userinput>gcc -dumpspecs | sed -e 's@/tools@@g'                   \
     -e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
-    -e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' &gt; \
+    -e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' &gt;      \
     `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
 
   <para>It is a good idea to visually inspect the specs file to verify the
@@ -84,8 +84,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
   and the output of the last command (allowing for platform-specific target triplets)
   will be:</para>
 
-<screen><computeroutput>SEARCH_DIR("/tools/i686-pc-linux-gnu/lib")
-SEARCH_DIR("/usr/lib")
+<screen><computeroutput>SEARCH_DIR("/usr/lib")
 SEARCH_DIR("/lib");</computeroutput></screen>
 
   <para os="l">Next make sure that we're using the correct libc:</para>
diff --git a/chapter06/attr.xml b/chapter06/attr.xml
index b5e2fcfae..584591fff 100644
--- a/chapter06/attr.xml
+++ b/chapter06/attr.xml
@@ -58,7 +58,7 @@
     attributes.  To test the results, issue:</para>
 
 <!-- ext-tests fail for some reason -->
-<screen><userinput remap="test">make tests root-tests</userinput></screen>
+<screen><userinput remap="test">make -k tests root-tests</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 0cca873ef..65f72a8f3 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -64,9 +64,11 @@ Ask your system administrator to create more.</computeroutput></screen>
 <screen><userinput remap="pre">rm -fv etc/standards.info
 sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
 
-    <para>Fix some test suite scripts so all tests pass:</para>
+    <para>Fix a couple of syntax errors that prevent the documentation from
+    building with Texinfo-&texinfo-version;:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-testsuite-fixes-patch;</userinput></screen>
+<screen><userinput remap="pre">sed -i -e 's/@colophon/@@colophon/' \
+       -e 's/doc@cygnus.com/doc@@cygnus.com/' bfd/doc/bfd.texinfo</userinput></screen>
 
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
@@ -78,13 +80,6 @@ cd ../binutils-build</userinput></screen>
 
 <screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr --enable-shared</userinput></screen>
 
-    <note><para>There is an optional argument to <command>configure</command>,
-    <option>--enable-lto</option>, that can be used to allow the
-    <command>ar</command>, <command>nm</command>, and <command>ranlib</command>
-    commands to accept a <option>--plugin</option> parameter.  This is used to
-    allow <command>gcc</command> to do "link time optimization" if specified.
-    No packages in LFS or BLFS currently use this capability.</para></note>
-
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make tooldir=/usr</userinput></screen>
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 6c6400045..0d8bd5c77 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -41,10 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Diffutils</title>
 
-    <para>Fix an incompatibility between this package and Glibc-&glibc-version;</para>
-
-<screen><userinput remap="pre">sed -i -e '/gets is a/d' lib/stdio.in.h</userinput></screen>
-
     <para>Prepare Diffutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 2489c111a..1f844f1a0 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -41,20 +41,6 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
 
-    <para>Apply a <command>sed</command> substitution that will suppress the
-    installation of <filename class="libraryfile">libiberty.a</filename>. The
-    version of <filename class="libraryfile">libiberty.a</filename> provided by
-    Binutils will be used instead:</para>
-
-<screen><userinput remap="pre">sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
-
-    <para>Again, do not build the .info files. They are broken with the current
-    version of <command>makeinfo</command>.</para>
-
-    <screen><userinput remap="pre">sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure</userinput></screen>
-
-
-
     <para>As in <xref linkend="ch-tools-gcc-pass2"/>, apply the following
     <command>sed</command> to force the build to use the
     <option>-fomit-frame-pointer</option> compiler flag in order to ensure
@@ -64,6 +50,12 @@
   i?86) sed -i 's/^T_CFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in ;;
 esac</userinput></screen>
 
+    <para>Workaround a bug so that GCC doesn't install
+    <filename class="libraryfile">libiberty.a</filename>, which is already
+    provided by Binutils:</para>
+
+<screen><userinput remap="pre">sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
+
     <para>Also fix an error in one of the check Makefiles:</para>
 
 <screen><userinput remap="pre">sed -i -e /autogen/d -e /check.sh/d fixincludes/Makefile.in</userinput></screen>
@@ -76,15 +68,16 @@ cd ../gcc-build</userinput></screen>
 
     <para>Prepare GCC for compilation:</para>
 
-<screen><userinput remap="configure">../gcc-&gcc-version;/configure --prefix=/usr            \
-                       --libexecdir=/usr/lib    \
-                       --enable-shared          \
-                       --enable-threads=posix   \
-                       --enable-__cxa_atexit    \
-                       --enable-clocale=gnu     \
-                       --enable-languages=c,c++ \
-                       --disable-multilib       \
-                       --disable-bootstrap      \
+<screen><userinput remap="configure">../gcc-&gcc-version;/configure --prefix=/usr               \
+                       --libexecdir=/usr/lib       \
+                       --enable-shared             \
+                       --enable-threads=posix      \
+                       --enable-__cxa_atexit       \
+                       --enable-clocale=gnu        \
+                       --enable-languages=c,c++    \
+                       --disable-multilib          \
+                       --disable-bootstrap         \
+                       --disable-install-libiberty \
                        --with-system-zlib</userinput></screen>
 
     <para>Note that for other languages, there are some prerequisites that
@@ -95,6 +88,14 @@ cd ../gcc-build</userinput></screen>
       <title>The meaning of the new configure option:</title>
 
       <varlistentry>
+        <term><parameter>--disable-install-libiberty</parameter></term>
+        <listitem>
+          <para>This prevents GCC from installing its own copy of libiberty,
+          which is already provided by Binutils-&binutils-version;.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><parameter>--with-system-zlib</parameter></term>
         <listitem>
           <para>This switch tells GCC to link to the system installed copy of
@@ -103,16 +104,6 @@ cd ../gcc-build</userinput></screen>
       </varlistentry>
     </variablelist>
 
-    <note>
-      <para>There is an optional argument to <command>configure</command>,
-      <option>--enable-lto</option>, that can be used to allow
-      <command>gcc</command> to do do "link time optimization" if specified.  No
-      packages in LFS or BLFS currently use this capability.</para>
-
-      <para>To use this feature, it must also be enabled in
-      <application>binutils</application>.</para>
-    </note>
-
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 4d8127e72..c07167443 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -79,12 +79,11 @@ cd ../glibc-build</userinput></screen>
 <!-- We would get /usr/lib/glibc/getconf instead of /usr/lib/getconf and
      /usr/lib/getconf was used before. Other distros seem to use same
      libexecdir -->
-<screen><userinput remap="configure">../glibc-&glibc-version;/configure   \
-    --prefix=/usr         \
-    --libexecdir=/usr/lib \
-    --disable-profile     \
-    --enable-kernel=2.6.25</userinput></screen>
-
+<screen><userinput remap="configure">../glibc-&glibc-version;/configure    \
+    --prefix=/usr          \
+    --disable-profile      \
+    --enable-kernel=2.6.25 \
+    --libexecdir=/usr/lib/glibc</userinput></screen>
     <variablelist>
       <title>The meaning of the new configure options:</title>
 
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index fbdc109b7..380e771e7 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -64,20 +64,20 @@ sed -i 's/resizecons.8 //' man/man8/Makefile.in &amp;&amp;</userinput></screen>
 
     <para>Prepare Kbd for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --datadir=/lib/kbd --disable-vlock</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --disable-vlock</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
-
+<!--
       <varlistentry>
-        <term><parameter>--datadir=/lib/kbd</parameter></term>
+        <term><parameter>- -datadir=/lib/kbd</parameter></term>
         <listitem>
           <para>This option puts keyboard layout data in a directory that will
           always be on the root partition instead of the default <filename
           class="directory">/usr/share/kbd</filename>.</para>
        </listitem>
       </varlistentry>
-
+-->
       <varlistentry>
         <term><parameter>--disable-vlock</parameter></term>
         <listitem>
@@ -106,6 +106,7 @@ sed -i 's/resizecons.8 //' man/man8/Makefile.in &amp;&amp;</userinput></screen>
       such languages have to download working keymaps separately.</para>
     </note>
 
+<!--
     <para>Some of the scripts in the LFS-Bootscripts package depend on
     <command>kbd_mode</command>, <command>loadkeys</command>,
     <command>openvt</command>, and
@@ -114,12 +115,11 @@ sed -i 's/resizecons.8 //' man/man8/Makefile.in &amp;&amp;</userinput></screen>
     need to be on the root partition:</para>
 
 <screen><userinput remap="install">mv -v /usr/bin/{kbd_mode,loadkeys,openvt,setfont} /bin</userinput></screen>
-
+-->
     <para>If desired, install the documentation:</para>
 
-<screen><userinput remap="install">mkdir -v /usr/share/doc/kbd-&kbd-version;
-cp -R -v doc/* \
-         /usr/share/doc/kbd-&kbd-version;</userinput></screen>
+<screen><userinput remap="install">mkdir -v       /usr/share/doc/kbd-&kbd-version;
+cp -R -v doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
 
   </sect2>
 
@@ -128,7 +128,7 @@ cp -R -v doc/* \
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbdinfo,
@@ -137,7 +137,8 @@ cp -R -v doc/* \
         psfxtable), psfstriptable (link to psfxtable), psfxtable, resizecons,
         setfont, setkeycodes, setleds, setmetamode,
         showconsolefont, showkey, unicode_start, and unicode_stop</seg>
-        <seg>/lib/kbd</seg>
+        <seg>/usr/share/consolefonts, /usr/share/consoletrans, /usr/share/keymaps,
+        /usr/share/unimaps</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/pkgconfig.xml b/chapter06/pkgconfig.xml
index 4b35c67bb..344e5ac19 100644
--- a/chapter06/pkgconfig.xml
+++ b/chapter06/pkgconfig.xml
@@ -55,8 +55,8 @@
       <varlistentry>
         <term><parameter>--with-internal-glib</parameter></term>
         <listitem>
-          <para>This will allow pkg-config to use it's internal version of
-          glib because an external version is not available in LFS.</para>
+          <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>
 
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 84c248a03..314aa1cb7 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -74,28 +74,26 @@
 <screen><userinput remap="make">make</userinput></screen>
 
     <para>The test suite needs some custom modifications for LFS.
-    The <command>which</command> command is not available, the
-    <command>pmap</command> test does not match a newline character in
-    two tests, and the <command>slabtop</command> test may return more than 
-    999,999 objects. To run the test suite, run the following commands:</para>
-
-<screen><userinput remap="test">pushd testsuite
-  sed -i -e 's|exec which sleep|exec echo /tools/bin/sleep|' \
-         -e 's|999999|&amp;9|'                       config/unix.exp
-  sed -i -e 's|pmap_initname\\\$|pmap_initname|' pmap.test/pmap.exp
-  make site.exp
-  DEJAGNU=global-conf.exp runtest
-popd</userinput></screen>
+    The <command>which</command> command is not available, and the
+    <command>slabtop</command> test may return more than 999,999 objects. 
+    Also fix one test that fails when scripting does not use a tty device.
+    To run the test suite, run the following commands:</para>
+
+<screen><userinput remap="test">sed -i -e 's|exec which sleep|exec echo /tools/bin/sleep|' \
+       -e 's|&amp;9|9999999|'             testsuite/config/unix.exp
+sed -i -r 's|(pmap_initname)\\\$|\1|' testsuite/pmap.test/pmap.exp
+
+make check</userinput></screen>
 
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-<para>Finally move the library to a location that can be found if
+<para>Finally, move the library to a location that can be found if
 <filename class="directory">/usr</filename> is not mounted.</para>
 
 <screen><userinput remap="install">mv -v /usr/lib/libprocps.so.* /lib
-ln -sfv ../../lib/libprocps.so.1.1.0 /usr/lib/libprocps.so</userinput></screen>
+ln -sfv ../../lib/libprocps.so.1.1.1 /usr/lib/libprocps.so</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index ddac76af7..602b7a1f6 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -59,8 +59,8 @@
         <listitem>
           <para>This forces the test for <function>mknod</function> to be run
           as root.  It is generally considered dangerous to run this test as
-          the root user, but as it is being run on an only partially built
-          system, overriding it is OK.</para>
+          the root user, but as it is being run on a system that has only been
+          partially built, overriding it is OK.</para>
         </listitem>
       </varlistentry>
     </variablelist>
diff --git a/general.ent b/general.ent
index 2fc59b75f..2500a2da4 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SYSTEMD-20130324">
-<!ENTITY releasedate "March 24, 2013">
+<!ENTITY version "SYSTEMD-20130428">
+<!ENTITY releasedate "April 28, 2013">
 <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.3">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 5bbd22387..76b8b1ae0 100644
--- a/packages.ent
+++ b/packages.ent
@@ -42,10 +42,10 @@
 <!ENTITY bash-ch6-du "45 MB">
 <!ENTITY bash-ch6-sbu "1.7 SBU">
 
-<!ENTITY binutils-version "2.23.1">
-<!ENTITY binutils-size "20,953 KB">
+<!ENTITY binutils-version "2.23.2">
+<!ENTITY binutils-size "20,938 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "33adb18c3048d057ac58d07a3f1adb38">
+<!ENTITY binutils-md5 "4f8fa651e35ef262edc01d60fb45702e">
 <!ENTITY binutils-home "http://www.gnu.org/software/binutils/">
 <!ENTITY binutils-ch5p1-du "391 MB">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
@@ -54,17 +54,17 @@
 <!ENTITY binutils-ch6-du "343 MB">
 <!ENTITY binutils-ch6-sbu "1.9 SBU">
 
-<!ENTITY bison-version "2.7">
-<!ENTITY bison-size "1,735 KB">
+<!ENTITY bison-version "2.7.1">
+<!ENTITY bison-size "1,744 KB">
 <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
-<!ENTITY bison-md5 "234cdfac99257cf99ac4a03c898f37b9">
+<!ENTITY bison-md5 "7be02eb973eccf388f1ae750fc09eed0">
 <!ENTITY bison-home "&gnu-software;bison/">
 <!--
 <!ENTITY bison-ch5-du "">
 <!ENTITY bison-ch5-sbu "">
 -->
-<!ENTITY bison-ch6-du "34 MB">
-<!ENTITY bison-ch6-sbu "1.3 SBU">
+<!ENTITY bison-ch6-du "31 MB">
+<!ENTITY bison-ch6-sbu "0.3 SBU">
 
 <!ENTITY bzip2-version "1.0.6">
 <!ENTITY bzip2-size "764 KB">
@@ -76,10 +76,10 @@
 <!ENTITY bzip2-ch6-du "6.9 MB">
 <!ENTITY bzip2-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY check-version "0.9.9">
-<!ENTITY check-size "589 KB">
+<!ENTITY check-version "0.9.10">
+<!ENTITY check-size "635 KB">
 <!ENTITY check-url "http://sourceforge.net/projects/check/files/check/&check-version;/check-&check-version;.tar.gz">
-<!ENTITY check-md5 "f3702f2fcfc19ce3f62dca66c241a168">
+<!ENTITY check-md5 "6d10a8efb9a683467b92b3bce97aeb30">
 <!ENTITY check-home "http://check.sourceforge.net/">
 <!ENTITY check-ch5-du "6.9 MB">
 <!ENTITY check-ch5-sbu "0.1 SBU">
@@ -110,10 +110,10 @@
 <!ENTITY dejagnu-ch5-du "4.1 MB">
 <!ENTITY dejagnu-ch5-sbu "less than 0.1 SBU">
 
-<!ENTITY diffutils-version "3.2">
-<!ENTITY diffutils-size "1,976 KB">
-<!ENTITY diffutils-url "&gnu;diffutils/diffutils-&diffutils-version;.tar.gz">
-<!ENTITY diffutils-md5 "22e4deef5d8949a727b159d6bc65c1cc">
+<!ENTITY diffutils-version "3.3">
+<!ENTITY diffutils-size "1,170 KB">
+<!ENTITY diffutils-url "&gnu;diffutils/diffutils-&diffutils-version;.tar.xz">
+<!ENTITY diffutils-md5 "99180208ec2a82ce71f55b0d7389f1b3">
 <!ENTITY diffutils-home "&gnu-software;diffutils/">
 <!ENTITY diffutils-ch5-du "8.5 MB">
 <!ENTITY diffutils-ch5-sbu "0.2 SBU">
@@ -148,10 +148,10 @@
 <!ENTITY expect-ch5-du "4.4 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 
-<!ENTITY file-version "5.13">
-<!ENTITY file-size "627 KB">
+<!ENTITY file-version "5.14">
+<!ENTITY file-size "633 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "d60c1364ba956eff7d21f8250808fc6d">
+<!ENTITY file-md5 "c26625f1d6773ad4bc5a87c0e315632c">
 <!ENTITY file-home "http://www.darwinsys.com/file/">
 <!ENTITY file-ch5-du "12.4 MB">
 <!ENTITY file-ch5-sbu "0.1 SBU">
@@ -190,10 +190,10 @@
 <!ENTITY gawk-ch6-du "30 MB">
 <!ENTITY gawk-ch6-sbu "0.2 SBU">
 
-<!ENTITY gcc-version "4.7.2">
-<!ENTITY gcc-size "80,942 KB">
+<!ENTITY gcc-version "4.8.0">
+<!ENTITY gcc-size "84,633 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "cc308a0891e778cfda7a151ab8a6e762">
+<!ENTITY gcc-md5 "e6040024eb9e761c3bea348d1fa5abb0">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "1.4 GB">
 <!ENTITY gcc-ch5p1-sbu "5.5 SBU">
@@ -326,20 +326,20 @@
 <!ENTITY kbd-ch6-du "20 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
 
-<!ENTITY kmod-version "12">
-<!ENTITY kmod-size "1,245 KB">
+<!ENTITY kmod-version "13">
+<!ENTITY kmod-size "1,408 KB">
 <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
-<!ENTITY kmod-md5 "3d63b146c8ee5a04dfbef4be97f8226b">
+<!ENTITY kmod-md5 "d5aba43b9370cd52f3cb35e82a1aa595">
 <!ENTITY kmod-home " ">
-<!ENTITY kmod-ch6-du "30 MB">
+<!ENTITY kmod-ch6-du "19 MB">
 <!ENTITY kmod-ch6-sbu "0.1 SBU">
 
-<!ENTITY less-version "451">
-<!ENTITY less-size "303 KB">
+<!ENTITY less-version "458">
+<!ENTITY less-size "308 KB">
 <!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
-<!ENTITY less-md5 "765f082658002b2b46b86af4a0da1842">
+<!ENTITY less-md5 "935b38aa2e73c888c210dedf8fd94f49">
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less/">
-<!ENTITY less-ch6-du "3.8 MB">
+<!ENTITY less-ch6-du "3.6 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
 <!ENTITY libcap-version "2.22">
@@ -350,14 +350,17 @@
 <!ENTITY libcap-ch6-du "1.3 MB">
 <!ENTITY libcap-ch6-sbu "0.1 SBU">
 
-<!ENTITY libpipeline-version "1.2.2">
-<!ENTITY libpipeline-size "733 KB">
+<!ENTITY libpipeline-version "1.2.3">
+<!ENTITY libpipeline-size "732 KB">
 <!ENTITY libpipeline-url "http://download.savannah.gnu.org/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
-<!ENTITY libpipeline-md5 "4367a3f598d171fd43dfa8620ed16d55">
+<!ENTITY libpipeline-md5 "f4866aa3a84f2852c78f87ff619dfc60">
 <!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
 <!ENTITY libpipeline-ch6-du "7.4 MB">
 <!ENTITY libpipeline-ch6-sbu "0.2 SBU">
 
+<!ENTITY libstdcpp-ch5-du "734 MB">
+<!ENTITY libstdcpp-ch5-sbu "0.4 SBU">
+
 <!ENTITY libtool-version "2.4.2">
 <!ENTITY libtool-size "2,571 KB">
 <!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.gz">
@@ -368,13 +371,13 @@
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "8">
-<!ENTITY linux-patch-version "3">
+<!ENTITY linux-patch-version "10">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!-- <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
-<!ENTITY linux-size "69,313 KB">
+<!ENTITY linux-size "69,330 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "eb59b1fc7343db96e20c85a9cf2baa9f">
-<!ENTITY linux-home "http://www.kernel.org/">
+<!ENTITY linux-md5 "3d5fb6d9add9cce7725bbe9b139c8d6e">
+<!ENTITY linux-home "http://www.dfaad4ced830akernel.org/">
 <!ENTITY linux-ch8-du "540 - 800 MB">
 <!ENTITY linux-ch8-sbu "1.0 - 5.0 SBU">
 
@@ -411,10 +414,10 @@
 <!ENTITY man-db-ch6-du "27 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-pages-version "3.50">
-<!ENTITY man-pages-size "1,116 KB">
+<!ENTITY man-pages-version "3.51">
+<!ENTITY man-pages-size "1,122 KB">
 <!ENTITY man-pages-url "http://www.kernel.org/pub/linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "41a424a405e88f2e45137485c115b8c6">
+<!ENTITY man-pages-md5 "63eef7d6d5abf30bc5b785e344d1df8b">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "22 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
@@ -477,10 +480,10 @@
 <!ENTITY pkgconfig-ch6-du "31 MB">
 <!ENTITY pkgconfig-ch6-sbu "0.4 SBU">
 
-<!ENTITY procps-ng-version "3.3.6">
-<!ENTITY procps-ng-size "528 KB">
+<!ENTITY procps-ng-version "3.3.7">
+<!ENTITY procps-ng-size "537 KB">
 <!ENTITY procps-ng-url "http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
-<!ENTITY procps-ng-md5 "0a050d9be531921db3cd38f1371e73e3">
+<!ENTITY procps-ng-md5 "57d2bad8c8fac3d09ee9f5f964e3da9c">
 <!ENTITY procps-ng-home "http://sourceforge.net/projects/procps-ng">
 <!ENTITY procps-ng-ch6-du "13 MB">
 <!ENTITY procps-ng-ch6-sbu "0.2 SBU">
@@ -519,12 +522,12 @@
 <!ENTITY shadow-ch6-du "42 MB">
 <!ENTITY shadow-ch6-sbu "0.2 SBU">
 
-<!ENTITY systemd-version "198">
-<!ENTITY systemd-size    "2,091 KB">
+<!ENTITY systemd-version "202">
+<!ENTITY systemd-size    "2,104 KB">
 <!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "26a75e2a310f8c1c1ea9ec26ddb171c5">
+<!ENTITY systemd-md5     "3136c6912d3ee1f6d4deb16234783731">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-ch6-du  "23 MB">
+<!ENTITY systemd-ch6-du  "35 MB">
 <!ENTITY systemd-ch6-sbu "0.1 SBU">
 
 <!ENTITY sysvinit-version "2.88dsf">
@@ -564,21 +567,21 @@
 <!ENTITY texinfo-ch6-du "101 MB">
 <!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
-<!ENTITY tzdata-version "2013b">
+<!ENTITY tzdata-version "2013c">
 <!ENTITY tzdata-size "213 KB">
-<!ENTITY tzdata-url "http://www.iana.org//time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "489dbca77d1f2e287a3987ca047bb246">
+<!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
+<!ENTITY tzdata-md5 "b5062217a2dea6823dd69b4dda97b249">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY util-linux-version "2.22.2">
-<!ENTITY util-linux-size "3,028 KB">
-<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.22/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "eeacbfdd2556acd899a2d0ffdb446185">
+<!ENTITY util-linux-version "2.23">
+<!ENTITY util-linux-size "3,248 KB">
+<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.23/util-linux-&util-linux-version;.tar.xz">
+<!ENTITY util-linux-md5 "cf5e9bb402371beaaffc3a5f276d5783">
 <!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
-<!ENTITY util-linux-ch6-du "83 MB">
-<!ENTITY util-linux-ch6-sbu "0.7 SBU">
+<!ENTITY util-linux-ch6-du "89 MB">
+<!ENTITY util-linux-ch6-sbu "0.6 SBU">
 
 <!ENTITY vim-version "7.3">
 <!ENTITY vim-docdir "vim/vim73">
diff --git a/patches.ent b/patches.ent
index 31725e9a2..380e5657a 100644
--- a/patches.ent
+++ b/patches.ent
@@ -6,10 +6,6 @@
 <!ENTITY bash-fixes-patch-md5 "419f95c173596aea47a23d922598977a">
 <!ENTITY bash-fixes-patch-size "56 KB">
 
-<!ENTITY binutils-testsuite-fixes-patch "binutils-&binutils-version;-testsuite_fix-1.patch">
-<!ENTITY binutils-testsuite-fixes-patch-md5 "cb47fae1bc572d45f4b0cff8ae8ecba8">
-<!ENTITY binutils-testsuite-fixes-patch-size "2.0 KB">
-
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
@@ -18,12 +14,6 @@
 <!ENTITY coreutils-i18n-patch-md5 "ada0ea6e1c00c4b7e0d634f49827943e">
 <!ENTITY coreutils-i18n-patch-size "132 KB">
 
-<!--
-<!ENTITY coreutils-test-patch "coreutils-&coreutils-version;-test_fixes-1.patch">
-<!ENTITY coreutils-test-patch-md5 "69639d7e09e3cfc66f151879e6d5d23d">
-<!ENTITY coreutils-test-patch-size "1.5 KB">
--->
-
 <!ENTITY flex-bison-patch "flex-&flex-version;-bison-2.6.1-1.patch">
 <!ENTITY flex-bison-patch-md5 "d5b001ef9bdbbe32e2f27576d97d8ff0">
 <!ENTITY flex-bison-patch-size "2.8 KB">
@@ -44,14 +34,6 @@
 <!ENTITY perl-libc-patch-md5 "daf5c64fd7311e924966842680535f8f">
 <!ENTITY perl-libc-patch-size "1.6 KB">
 
-<!ENTITY procps-hz_fixes-patch "procps-&procps-version;-fix_HZ_errors-1.patch">
-<!ENTITY procps-hz_fixes-patch-md5 "2ea4c8e9a2c2a5a291ec63c92d7c6e3b">
-<!ENTITY procps-hz_fixes-patch-size "2.3 KB">
-
-<!ENTITY procps-watch-patch "procps-&procps-version;-watch_unicode-1.patch">
-<!ENTITY procps-watch-patch-md5 "cd1a757e532d93662a7ed71da80e6b58">
-<!ENTITY procps-watch-patch-size "3.5 KB">
-
 <!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-1.patch">
 <!ENTITY readline-fixes-patch-md5 "3c185f7b76001d3d0af614f6f2cd5dfa">
 <!ENTITY readline-fixes-patch-size "1.3 KB">
diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml
index 74cb9e573..c56a91f06 100644
--- a/prologue/hostreqs.xml
+++ b/prologue/hostreqs.xml
@@ -61,9 +61,9 @@
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Gcc-4.1.2</emphasis> (Versions
-      greater than &gcc-version; are not recommended as they have not
-      been tested)</para>
+      <para><emphasis role="strong">GCC-4.1.2</emphasis> including the C++
+      compiler, <command>g++</command> (Versions greater than &gcc-version; are
+      not recommended as they have not been tested)</para>
     </listitem>
 
     <listitem>
@@ -170,6 +170,7 @@ if [ -e /usr/bin/awk ];
   else echo "awk not found"; fi
 
 gcc --version | head -n1
+g++ --version | head -n1
 ldd --version | head -n1 | cut -d" " -f2-  # glibc version
 grep --version | head -n1
 gzip --version | head -n1
@@ -183,10 +184,10 @@ tar --version | head -n1
 echo "Texinfo: `makeinfo --version | head -n1`"
 xz --version | head -n1
 
-echo 'main(){}' &gt; dummy.c &amp;&amp; gcc -o dummy dummy.c
+echo 'main(){}' &gt; dummy.c &amp;&amp; g++ -o dummy dummy.c
 if [ -x dummy ]
-  then echo "gcc compilation OK";
-  else echo "gcc compilation failed"; fi
+  then echo "g++ compilation OK";
+  else echo "g++ compilation failed"; fi
 rm -f dummy.c dummy</literal>
 EOF