diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 008df2410..35d1f22ff 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,20 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2021-08-08</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.13.9. Fixes
+          <ulink url="&lfs-ticket-root;4900">#4900</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libffi-3.4.2. Fixes
+          <ulink url="&lfs-ticket-root;4902">#4902</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2021-08-06</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 1445f30d8..0db970287 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -159,9 +159,9 @@
     <listitem>
       <para>Libelf-&elfutils-version; (from elfutils)</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Libffi-&libffi-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Libpipeline-&libpipeline-version;</para>
     </listitem>-->
diff --git a/chapter08/libffi.xml b/chapter08/libffi.xml
index a2e0cb545..786e66c5d 100644
--- a/chapter08/libffi.xml
+++ b/chapter08/libffi.xml
@@ -52,7 +52,10 @@
 
     <para>Prepare libffi for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --disable-static --with-gcc-arch=native</userinput></screen>
+    <screen><userinput remap="configure">./configure --prefix=/usr          \
+            --disable-static       \
+            --with-gcc-arch=native \
+            --disable-exec-static-tramp </userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure option:</title>
diff --git a/lfs-latest-git.php b/lfs-latest-git.php
index 29633c212..6130d48d1 100644
--- a/lfs-latest-git.php
+++ b/lfs-latest-git.php
@@ -119,6 +119,7 @@ if ( $package == "flex"       ) $dirpath = "https://github.com/westes/flex/relea
 if ( $package == "gcc"        ) $dirpath = max_parent( $dirpath, "gcc-" );
 if ( $package == "iana-etc"   ) $dirpath = "https://github.com/Mic92/iana-etc/releases";
 if ( $package == "intltool"   ) $dirpath = "https://launchpad.net/intltool/trunk";
+if ( $package == "libffi"     ) $dirpath = "https://github.com/libffi/libffi/releases";
 if ( $package == "meson"      ) $dirpath = "https://github.com/mesonbuild/meson/releases";
 if ( $package == "mpc"        ) $dirpath = "https://ftp.gnu.org/gnu/mpc";
 if ( $package == "mpfr"       ) $dirpath = "http://mpfr.loria.fr/mpfr-current";
diff --git a/packages.ent b/packages.ent
index ea9a1aa91..fba480d94 100644
--- a/packages.ent
+++ b/packages.ent
@@ -410,10 +410,10 @@
 <!ENTITY libcap-fin-du "45 MB">
 <!ENTITY libcap-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY libffi-version "3.3">
-<!ENTITY libffi-size "1,275 KB">
-<!ENTITY libffi-url "https://sourceware.org/pub/libffi/libffi-&libffi-version;.tar.gz">
-<!ENTITY libffi-md5 "6313289e32f1d38a9df4770b014a2ca7">
+<!ENTITY libffi-version "3.4.2">
+<!ENTITY libffi-size "1,320 KB">
+<!ENTITY libffi-url "https://github.com/libffi/libffi/releases/download/v&libffi-version;/libffi-&libffi-version;.tar.gz">
+<!ENTITY libffi-md5 "294b921e6cf9ab0fbaea4b639f8fdbe8">
 <!ENTITY libffi-home "https://sourceware.org/libffi/">
 <!ENTITY libffi-fin-du "10 MB">
 <!ENTITY libffi-fin-sbu "1.9 SBU">
@@ -436,12 +436,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "13">
-<!ENTITY linux-patch-version "7">
+<!ENTITY linux-patch-version "9">
 <!--<!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,544 KB">
+<!ENTITY linux-size "116,541 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "9bd74571c148a7753f5a237ba52f8ee5">
+<!ENTITY linux-md5 "f1ce10256453cb1746536d09f9daf263">
 <!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,
diff --git a/prologue/why.xml b/prologue/why.xml
index 3996e3c2d..24b792e45 100644
--- a/prologue/why.xml
+++ b/prologue/why.xml
@@ -158,8 +158,7 @@
 
         <para>This package contains a program for carrying out scripted
         dialogues with other interactive programs.  It is commonly used
-        for testing other packages.  It is only installed in the temporary
-        toolchain.</para>
+        for testing other packages.</para>
       </listitem>
 
       <listitem>