diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 86adfbf1b..e96e806d8 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,25 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2021-08-01</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Remove unneeded sed commands from automake and
+           coreutils. Fixes 
+           <ulink url="&lfs-ticket-root;4895">#4895</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.13.7. Fixes
+          <ulink url="&lfs-ticket-root;4893">#4893</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.46.3. Fixes
+          <ulink url="&lfs-ticket-root;4896">#4896</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
 
     <listitem>
       <para>2021-07-27</para>
diff --git a/chapter08/automake.xml b/chapter08/automake.xml
index 33db7bcb9..0ea77d729 100644
--- a/chapter08/automake.xml
+++ b/chapter08/automake.xml
@@ -40,11 +40,11 @@
 
   <sect2 role="installation">
     <title>Installation of Automake</title>
-
+<!--
     <para>Fix a failing test:</para>
 
 <screen><userinput remap="pre">sed -i "s/''/etags/" t/tags-lisp-space.sh</userinput></screen>
-
+-->
     <para>Prepare Automake for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
@@ -58,10 +58,10 @@
     the results, issue:</para>
 
 <screen><userinput remap="test">make -j4 check</userinput></screen>
-
+<!--
     <para>The tests t/subobj.sh, t/deprecated-acinit.sh, and t/init.sh are known to 
     fail in the LFS environment.</para>
-
+-->
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml
index 93f5b2783..1670f43ac 100644
--- a/chapter08/binutils.xml
+++ b/chapter08/binutils.xml
@@ -181,11 +181,13 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="test">make -k check</userinput></screen>
 
+    <para>Foru tests related to zlib are known ot fail.</para>
+<!--
     <para>Seven gold tests are known to fail with gcc-11.1.0</para>
 
     <para>Four ld tests named <quote>Run property ...</quote> are known to
     fail.</para>
-
+ -->
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make tooldir=/usr install -j1</userinput></screen>
diff --git a/chapter08/check.xml b/chapter08/check.xml
index 6624f8e0d..1e7e4ec17 100644
--- a/chapter08/check.xml
+++ b/chapter08/check.xml
@@ -53,9 +53,9 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>Note that the Check test suite may take a relatively long
+<!--    <para>Note that the Check test suite may take a relatively long
     (up to 4 SBU) time.</para>
-
+-->
     <para>Install the package:</para>
 
     <screen><userinput remap="install">make docdir=/usr/share/doc/check-&check-version; install</userinput></screen>
diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index c5d2a5032..cb8ec6d64 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -56,9 +56,11 @@
    <!-- this has been fixed in upstream gnulib, when a new version of
    coreutils is released, please check #4055 to see if the change has been
    picked up in this package -->
+<!--
    <para>Suppress a test which on some machines can loop forever:</para>
 
 <screen><userinput remap="pre">sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk</userinput></screen>
+-->
 <!--
 <para>Fix a problem with autoconf-2.70 in an included gnulib .m4 file:</para>
 
@@ -130,9 +132,9 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
     <para>Now run the tests:</para>
 
 <screen><userinput remap="test">su tester -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
-
+<!--
     <para>The test-getlogin test is known to fail in the LFS chroot environment.</para>
-
+-->
     <para>Remove the temporary group:</para>
 
 <screen><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen>
diff --git a/chapter08/e2fsprogs.xml b/chapter08/e2fsprogs.xml
index 2ebe2dd3d..4144cd205 100644
--- a/chapter08/e2fsprogs.xml
+++ b/chapter08/e2fsprogs.xml
@@ -93,18 +93,20 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-<para>One test, m_rootdir_acl, is known to fail.</para>
 <!-- This is a ridiculous amount now! And is it still true?
+     Does not appear to be true for version 1.46.3.  Time with tests
+     26 seconds with tests (With lots of cores and ram and an ssd disk).
+
     <para>One of the e2fsprogs tests will attempt to allocate 256 MB of memory.
     If you do not have significantly more RAM than this, be sure to enable
     sufficient swap space for the test. See <xref
     linkend="ch-partitioning-creatingfilesystem"/> and <xref
     linkend="ch-partitioning-mounting"/>
     for details on creating and enabling swap space.</para>
--->
+
     <para>On a spinning disk, the tests take a little more than 4 SBUs. They
     can be much shorter on an SSD (down to about 1.5 SBUs).</para>
-
+-->
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index e8befe569..5cd1da5a6 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -139,13 +139,14 @@ su tester -c "PATH=$PATH make -k check"</userinput></screen>
     url="&test-results;"/> and
     <ulink url="https://gcc.gnu.org/ml/gcc-testresults/"/>.</para>
 
-    <para>In g++, three tests in constexpr-52830 are known to fail and
+ <!--    <para>In g++, three tests in constexpr-52830 are known to fail and
     also to be treated as unexpected successes (XPASS).  This is because
     an <quote>internal compiler error</quote> on this test is fixed, but
     the compiler still rejects some valid code.</para>
-
+ -->
     <!--  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96322
           https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71367 -->
+
     <para>In libstdc++, one numpunct test and six tests related to get_time are
     known to fail.  These are all because the locale definitions in glibc have
     changed but libstdc++ does not currently support those changes.</para>
diff --git a/chapter08/gdbm.xml b/chapter08/gdbm.xml
index 72f53f250..431987f52 100644
--- a/chapter08/gdbm.xml
+++ b/chapter08/gdbm.xml
@@ -74,11 +74,11 @@
     <para>To test the results, issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
-
+<!--
     <para>
       One test, <filename>version</filename>, is known to fail.
     </para>
-
+-->
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/chapter08/inetutils.xml b/chapter08/inetutils.xml
index b80db6f1d..ad828f67d 100644
--- a/chapter08/inetutils.xml
+++ b/chapter08/inetutils.xml
@@ -105,12 +105,12 @@
     <para>To test the results, issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
-
+<!--
     <note><para>One test, libls.sh, may fail in the initial chroot
     environment but will pass if the test is rerun after the LFS system
     is complete. One test, ping-localhost.sh, will fail if the host
     system does not have ipv6 capability.</para></note>
-
+-->
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/chapter08/m4.xml b/chapter08/m4.xml
index 13b032a25..341da580a 100644
--- a/chapter08/m4.xml
+++ b/chapter08/m4.xml
@@ -57,6 +57,8 @@ echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h</userinput></screen>
 
 <screen><userinput remap="test">make check</userinput></screen>
 
+    <para>One test, test-posix_spawn-script, is known to fail.</para>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/chapter08/tar.xml b/chapter08/tar.xml
index 2adad5790..b4ec0e28b 100644
--- a/chapter08/tar.xml
+++ b/chapter08/tar.xml
@@ -68,7 +68,7 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results (about 3 SBU), issue:</para>
+    <para>To test the results, issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
 
diff --git a/chapter08/tcl.xml b/chapter08/tcl.xml
index 4cac2f64a..9f0a7401c 100644
--- a/chapter08/tcl.xml
+++ b/chapter08/tcl.xml
@@ -112,7 +112,7 @@ unset SRCDIR</userinput></screen>
     <para>To test the results, issue:</para>
 
 <screen><userinput remap="test">make test</userinput></screen>
-
+<!--
    <note>
       <para>
          In the test results there are several places associated with clock.test
@@ -120,6 +120,8 @@ unset SRCDIR</userinput></screen>
          failures. clock.test passes on a complete LFS system.
       </para>
     </note>
+-->
+    <para>One test, unixInit-1.2, is known to fail.</para>
 
     <para>Install the package:</para>
 
diff --git a/packages.ent b/packages.ent
index 3dcc0b61c..b263e560d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -140,10 +140,10 @@
 <!ENTITY diffutils-fin-du "33 MB">
 <!ENTITY diffutils-fin-sbu "0.4 SBU">
 
-<!ENTITY e2fsprogs-version "1.46.2">
-<!ENTITY e2fsprogs-size "9,2675 KB">
+<!ENTITY e2fsprogs-version "1.46.3">
+<!ENTITY e2fsprogs-size "9,2688 KB">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "e8ef5fa3b72557be5e9fe564a25da6eb">
+<!ENTITY e2fsprogs-md5 "0edcffc4b601a4191bfa152f61b406b2">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-fin-du "102 MB">
 <!ENTITY e2fsprogs-fin-sbu "4.4 SBU on a spinning disk, 1.5 SBU on an SSD">
@@ -436,12 +436,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "13">
-<!ENTITY linux-patch-version "4">
+<!ENTITY linux-patch-version "7">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "116,536 KB">
+<!ENTITY linux-size "116,544 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "50aa48ae38a736b3f313a777574af3d3">
+<!ENTITY linux-md5 "9bd74571c148a7753f5a237ba52f8ee5">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
  allnoconfig rounded down to allow for ongoing cleanups,