Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision ea0f48e5a8d9b1e8d6a41ee2985b573f05c12985)
+++ chapter01/changelog.xml	(revision 9c7598cc15b7ec877b0350fbdc9d1d1fe466405b)
@@ -44,4 +44,22 @@
     -->
     <listitem>
+      <para>2021-08-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to glibc-2.34. Fixes
+          <ulink url="&lfs-ticket-root;4897">#4897</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to diffutils-3.8. Fixes
+          <ulink url="&lfs-ticket-root;4898">#4898</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.52. Fixes
+          <ulink url="&lfs-ticket-root;4899">#4899</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-08-01</para>
       <itemizedlist>
@@ -61,5 +79,4 @@
       </itemizedlist>
     </listitem>
-
 
     <listitem>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision ea0f48e5a8d9b1e8d6a41ee2985b573f05c12985)
+++ chapter01/whatsnew.xml	(revision 9c7598cc15b7ec877b0350fbdc9d1d1fe466405b)
@@ -70,7 +70,7 @@
       <para>D-Bus-&dbus-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Diffutils-&diffutils-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
        <para>E2fsprogs-&e2fsprogs-version;</para>
@@ -106,7 +106,7 @@
       <para>Gettext-&gettext-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Glibc-&glibc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GMP-&gmp-version;</para>
Index: chapter05/glibc.xml
===================================================================
--- chapter05/glibc.xml	(revision ea0f48e5a8d9b1e8d6a41ee2985b573f05c12985)
+++ chapter05/glibc.xml	(revision 9c7598cc15b7ec877b0350fbdc9d1d1fe466405b)
@@ -63,8 +63,4 @@
 <screen><userinput remap="pre">patch -Np1 -i ../glibc-&glibc-version;-fhs-1.patch</userinput></screen>
 
-    <para>Fix a build issue with gcc-11.1:</para>
-
-<screen><userinput remap="pre">sed 's/amx_/amx-/' -i sysdeps/x86/tst-cpu-features-supports.c</userinput></screen>
-
     <para>The Glibc documentation recommends building Glibc 
     in a dedicated build directory:</para>
@@ -128,15 +124,4 @@
       </varlistentry>
 
-      <varlistentry>
-        <term><option>libc_cv_include_x86_isa_level=no</option></term>
-        <listitem>
-          <para>This disables <quote>x86 ISA needed</quote> property in
-          Glibc libraries.  Use it <emphasis role="bold">if</emphasis>
-          you are building Glibc with <option>-march</option> option in
-          <envar>CFLAGS</envar>, to workaround an issue in Glibc-2.33
-          breaking it.</para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
Index: chapter07/texinfo.xml
===================================================================
--- chapter07/texinfo.xml	(revision ea0f48e5a8d9b1e8d6a41ee2985b573f05c12985)
+++ chapter07/texinfo.xml	(revision 9c7598cc15b7ec877b0350fbdc9d1d1fe466405b)
@@ -44,4 +44,9 @@
     <title>Installation of Texinfo</title>
 
+    <para>First, fix an issue building the package with Glibc-2.34 or later:</para>
+
+<screen><userinput remap="pre">sed -e 's/__attribute_nonnull__/__nonnull/' \
+    -i gnulib/lib/malloc/dynarray-skeleton.c</userinput></screen>
+
     <para>Prepare Texinfo for compilation:</para>
 
Index: chapter08/glibc.xml
===================================================================
--- chapter08/glibc.xml	(revision ea0f48e5a8d9b1e8d6a41ee2985b573f05c12985)
+++ chapter08/glibc.xml	(revision 9c7598cc15b7ec877b0350fbdc9d1d1fe466405b)
@@ -51,13 +51,4 @@
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
 
-    <para>Fix a bug that causes issues with chrooted applications:</para>
-
-    <screen><userinput remap="pre">sed -e '402a\      *result = local->data.services[database_index];' \
-    -i nss/nss_database.c</userinput></screen>
-
-    <para>Fix a build issue with gcc-11.1:</para>
-
-<screen><userinput remap="pre">sed 's/amx_/amx-/' -i sysdeps/x86/tst-cpu-features-supports.c</userinput></screen>
-
     <para>The Glibc documentation recommends building Glibc 
     in a dedicated build directory:</para>
@@ -127,15 +118,4 @@
       </varlistentry>
 
-      <varlistentry>
-        <term><option>libc_cv_include_x86_isa_level=no</option></term>
-        <listitem>
-          <para>This disables <quote>x86 ISA needed</quote> property in
-          Glibc libraries.  Use it <emphasis role="bold">if</emphasis>
-          you are building Glibc with <option>-march</option> option in
-          <envar>CFLAGS</envar>, to workaround an issue in Glibc-2.33
-          breaking it.</para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
@@ -178,12 +158,4 @@
         <para><emphasis>misc/tst-ttyname</emphasis> 
         is known to fail in the LFS chroot environment.</para>
-      </listitem>
-
-      <listitem>
-        <!-- FIXME This currently tests SSBD and STIBP which do not exist
-         on non-intel, should be fixed in glibc-2.34
-         https://sourceware.org/pipermail/libc-alpha/2021-January/122171.html -->
-        <para><emphasis>elf/tst-cpu-features-cpuinfo</emphasis>
-        will fail on non-intel CPUs with this version of glibc.</para>
       </listitem>
 
@@ -505,12 +477,13 @@
         pcprofiledump, pldd, sln, sotruss, sprof, tzselect, xtrace,
         zdump, and zic</seg>
-        <seg>ld-&glibc-version;.so, libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
+        <seg>ld-linux-x86-64.so.2, ld-linux.so.2,
+        libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
         libc.{a,so}, libc_nonshared.a,
-        libcrypt.{a,so}, libdl.{a,so}, libg.a, libm.{a,so},
-        libmcheck.a, libmemusage.so, libmvec.{a,so}, libnsl.{a,so},
+        libcrypt.{a,so}, libdl.{a,so.2}, libg.a, libm.{a,so},
+        libmcheck.a, libmemusage.so, libmvec.{a,so}, libnsl.so.1,
         libnss_compat.so, libnss_dns.so, libnss_files.so, libnss_hesiod.so,
-        libpcprofile.so, libpthread.{a,so},
-        libpthread_nonshared.a, libresolv.{a,so}, librt.{a,so},
-        libthread_db.so, and libutil.{a,so}</seg>
+        libpcprofile.so, libpthread.{a,so.0},
+        libresolv.{a,so}, librt.{a,so.1},
+        libthread_db.so, and libutil.{a,so.1}</seg>
         <seg>/usr/include/arpa, /usr/include/bits, /usr/include/gnu,
         /usr/include/net, /usr/include/netash, /usr/include/netatalk,
@@ -769,5 +742,5 @@
 
       <varlistentry id="ld.so">
-        <term><filename class="libraryfile">ld-&glibc-version;.so</filename></term>
+        <term><filename class="libraryfile">ld-*.so</filename></term>
         <listitem>
           <para>The helper program for shared library executables</para>
@@ -835,5 +808,7 @@
         <term><filename class="libraryfile">libdl</filename></term>
         <listitem>
-          <para>The dynamic linking interface library</para>
+          <para>Dummy library containing no functions. Previously was the
+          dynamic linking interface library, whose functions are now in
+          <filename class="libraryfile">libc</filename></para>
           <indexterm zone="ch-system-glibc libdl">
             <primary sortas="c-libdl">libdl</primary>
@@ -887,5 +862,5 @@
         <term><filename class="libraryfile">libnsl</filename></term>
         <listitem>
-          <para>The network services library</para>
+          <para>The network services library, now deprecated</para>
           <indexterm zone="ch-system-glibc libnsl">
             <primary sortas="c-libnsl">libnsl</primary>
@@ -919,5 +894,8 @@
         <term><filename class="libraryfile">libpthread</filename></term>
         <listitem>
-          <para>The POSIX threads library</para>
+          <para>Dummy library containing no functions. Previously contained
+          functions providing most of the interfaces specified
+          by the POSIX.1b Realtime Extension, now the functions are in
+          <filename class="libraryfile">libc</filename></para>
           <indexterm zone="ch-system-glibc libpthread">
             <primary sortas="c-libpthread">libpthread</primary>
@@ -962,6 +940,9 @@
         <term><filename class="libraryfile">libutil</filename></term>
         <listitem>
-          <para>Contains code for <quote>standard</quote> functions used in
-          many different Unix utilities</para>
+          <para>>Dummy library containing no functions. Previously contained
+          code for <quote>standard</quote> functions used in
+          many different Unix utilities. These functions are now in
+          <filename class="libraryfile">libc</filename></para>
+          
           <indexterm zone="ch-system-glibc libutil">
             <primary sortas="c-libutil">libutil</primary>
Index: chapter08/strippingagain.xml
===================================================================
--- chapter08/strippingagain.xml	(revision ea0f48e5a8d9b1e8d6a41ee2985b573f05c12985)
+++ chapter08/strippingagain.xml	(revision 9c7598cc15b7ec877b0350fbdc9d1d1fe466405b)
@@ -44,7 +44,12 @@
 
 <!--<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"-->
-<screen><userinput>save_usrlib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so
-             libquadmath.so.&libquadmath-version; libstdc++.so.&libstdcpp-version;
-             libitm.so.&libitm-version; libatomic.so.&libatomic-version;" <!-- libcilkrts.so.&libcilkrts-version;-->
+<screen><userinput>save_usrlib="ld-linux-x86-64.so.2
+                                libc.so.6
+                                libpthread.so.6 
+                                libthread_db.so
+                                libquadmath.so.&libquadmath-version; 
+                                libstdc++.so.6
+                                libitm.so.&libitm-version; 
+                                libatomic.so.&libatomic-version;" 
 
 cd /usr/lib
@@ -60,8 +65,11 @@
 
 online_usrbin="bash find strip"
-online_usrlib="libbfd-&binutils-version;.so libdl-&glibc-version;.so
-               libhistory.so.&readline-version; libncursesw.so.&ncurses-version;
-               libm-&glibc-version;.so libreadline.so.&readline-version;
-               libz.so.&zlib-version;
+online_usrlib="libbfd.so 
+               libdl.so.2
+               libhistory.so
+               libncursesw.so
+               libm.so.6 
+               libreadline.so
+               libz.so
                $(cd /usr/lib; find libnss*.so* -type f)"
 
Index: chapter08/texinfo.xml
===================================================================
--- chapter08/texinfo.xml	(revision ea0f48e5a8d9b1e8d6a41ee2985b573f05c12985)
+++ chapter08/texinfo.xml	(revision 9c7598cc15b7ec877b0350fbdc9d1d1fe466405b)
@@ -62,4 +62,10 @@
     </variablelist>
 -->
+
+    <para>Again, fix an issue building the package with Glibc-2.34 or later:</para>
+
+<screen><userinput remap="pre">sed -e 's/__attribute_nonnull__/__nonnull/' \
+    -i gnulib/lib/malloc/dynarray-skeleton.c</userinput></screen>
+
     <para>Compile the package:</para>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision ea0f48e5a8d9b1e8d6a41ee2985b573f05c12985)
+++ packages.ent	(revision 9c7598cc15b7ec877b0350fbdc9d1d1fe466405b)
@@ -131,8 +131,8 @@
 <!ENTITY dejagnu-tmp-sbu "less than 0.1 SBU">
 
-<!ENTITY diffutils-version "3.7">
-<!ENTITY diffutils-size "1,415 KB">
+<!ENTITY diffutils-version "3.8">
+<!ENTITY diffutils-size "1,548 KB">
 <!ENTITY diffutils-url "&gnu;diffutils/diffutils-&diffutils-version;.tar.xz">
-<!ENTITY diffutils-md5 "4824adc0e95dbbf11dfbdfaad6a1e461">
+<!ENTITY diffutils-md5 "6a6b0fdc72acfe3f2829aab477876fbc">
 <!ENTITY diffutils-home "&gnu-software;diffutils/">
 <!ENTITY diffutils-tmp-du "26 MB">
@@ -259,8 +259,8 @@
 <!ENTITY gettext-fin-sbu "2.9 SBU">
 
-<!ENTITY glibc-version "2.33">
-<!ENTITY glibc-size "16,663 KB">
+<!ENTITY glibc-version "2.34">
+<!ENTITY glibc-size "16,896 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
-<!ENTITY glibc-md5 "390bbd889c7e8e8a7041564cb6b27cca">
+<!ENTITY glibc-md5 "31998b53fb39cb946e96abc310af1c89">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-tmp-du "770 MB">
@@ -395,8 +395,8 @@
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.51">
-<!ENTITY libcap-size "143 KB">
+<!ENTITY libcap-version "2.52">
+<!ENTITY libcap-size "155 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "4c9febc1bf0afca6a4d9f86fcdb6d900">
+<!ENTITY libcap-md5 "91548d37bbb5b706928bc3b3bb0e22ac">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "45 MB">
