diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9fa748f9a..4d12af9b9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,6 +45,7 @@
           <para>[krejzi] - Added new users and groups needed for
           systemd-216. Note that existing users and groups for
           systemd got their UIDs/GIDs changed.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 1bd4c4a20..132f54b5d 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -117,10 +117,6 @@ RANLIB=$LFS_TGT-ranlib                               \
     --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                               \
@@ -130,39 +126,6 @@ RANLIB=$LFS_TGT-ranlib                               \
     <variablelist>
       <title>The meaning of the new configure options:</title>
 
-      <varlistentry>
-        <term><parameter>--enable-clocale=gnu</parameter></term>
-        <listitem>
-          <para>This option ensures the correct locale model is selected
-          for the C++ libraries under all circumstances. If the configure
-          script finds the <emphasis>de_DE</emphasis> locale installed,
-          it will select the correct gnu locale model. However, if the
-          <emphasis>de_DE</emphasis> locale is not installed, there is the
-          risk of building Application Binary Interface (ABI)-incompatible
-          C++ libraries because the incorrect generic locale model may be
-          selected.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-threads=posix</parameter></term>
-        <listitem>
-          <para>This enables C++ exception handling for multi-threaded code.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-__cxa_atexit</parameter></term>
-        <listitem>
-          <para>This option allows use of <function>__cxa_atexit</function>,
-          rather than <function>atexit</function>, to register C++ destructors
-          for local statics and global objects. This option is essential for
-          fully standards-compliant handling of destructors. It also affects
-          the C++ ABI, and therefore results in C++ shared libraries and C++
-          programs that are interoperable with other Linux distributions.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><parameter>--enable-languages=c,c++</parameter></term>
         <listitem>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 8dc997b01..f34c028d2 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -72,10 +72,6 @@ cd ../gcc-build</userinput></screen>
 <screen><userinput remap="configure">SED=sed                       \
 ../gcc-&gcc-version;/configure        \
      --prefix=/usr            \
-     --enable-shared          \
-     --enable-threads=posix   \
-     --enable-__cxa_atexit    \
-     --enable-clocale=gnu     \
      --enable-languages=c,c++ \
      --disable-multilib       \
      --disable-bootstrap      \
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index dbcea0791..48193f935 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -79,6 +79,9 @@
     <screen><userinput remap="test">chown -Rv nobody .
 su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
 
+    <note><para>One test above, tests/ts/ipcs/limits2, will fail when the host 
+    is using a recent kernel.  The failure can safely be ignored.</para></note>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/general.ent b/general.ent
index f327abb4f..c7d93bb4e 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20140816-systemd">
+<!ENTITY version         "20140820-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "August 16, 2014">
+<!ENTITY releasedate     "August 20, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.6">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->