diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c84ee042a..ab574e5a5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -46,13 +46,24 @@
     <listitem>
       <para>2021-07-27</para>
       <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to GCC-11.2.0. Fixes
+          <ulink url="&lfs-ticket-root;4883">#4883</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to inetutils-2.1. Fixes
+          <ulink url="&lfs-ticket-root;4892">#4892</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to automake-1.16.4. Fixes
+          <ulink url="&lfs-ticket-root;4894">#4894</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[xry111] - Always use --strip-unneeded for stripping.</para>
         </listitem>
       </itemizedlist>
     </listitem>
 
-    <listitem>
     <listitem>
       <para>2021-07-27</para>
       <itemizedlist>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 8cfba4ba8..191f7f921 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -47,6 +47,7 @@
         <para>Home page: <ulink url="&automake-home;"/></para>
         <para>Download: <ulink url="&automake-url;"/></para>
         <para>MD5 sum: <literal>&automake-md5;</literal></para>
+        <para>SHA256 sum: <literal>&automake-sha256;</literal></para>
       </listitem>
     </varlistentry>
 
@@ -226,6 +227,7 @@
         <para>Home page: <ulink url="&gcc-home;"/></para>
         <para>Download: <ulink url="&gcc-url;"/></para>
         <para>MD5 sum: <literal>&gcc-md5;</literal></para>
+        <para>SHA256 sum: <literal>&gcc-sha256;</literal></para>
       </listitem>
     </varlistentry>
 
@@ -325,6 +327,7 @@
         <para>Home page: <ulink url="&inetutils-home;"/></para>
         <para>Download: <ulink url="&inetutils-url;"/></para>
         <para>MD5 sum: <literal>&inetutils-md5;</literal></para>
+        <para>SHA256 sum: <literal>&inetutils-sha256;</literal></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index fc980206b..8aa5bed39 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -68,14 +68,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>GCC Upstream Fixes Patch - <token>&gcc-upstream-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&gcc-upstream-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-upstream-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index 26711f632..f7facefdd 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -41,11 +41,6 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
 
-    <para>First, apply a patch to fix some regressions and to cope
-    with the removal of an obsolete kernel header in linux-5.13:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../gcc-&gcc-version;-upstream_fixes-1.patch</userinput></screen>
-
     <para>If building on x86_64, change the default directory name for 64-bit
     libraries to <quote>lib</quote>:</para>
 
diff --git a/packages.ent b/packages.ent
index acaf9d22d..ddcd52b97 100644
--- a/packages.ent
+++ b/packages.ent
@@ -38,11 +38,12 @@
 <!ENTITY autoconf-fin-sbu-tests "7.2">
 <!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)">
 
-<!ENTITY automake-version "1.16.3">
+<!ENTITY automake-version "1.16.4">
 <!ENTITY am-minor-version "1.16">
-<!ENTITY automake-size "1,554 KB">
+<!ENTITY automake-size "1,564 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "c27f608a4e1f302ec7ce42f1251c184e">
+<!ENTITY automake-md5 "86e8e682bd74e6390a016c4d9c11267c">
+<!ENTITY automake-sha256 "80facc09885a57e6d49d06972c0ae1089c5fa8f4d4c7cfe5baea58e5085f136d">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-fin-du "115 MB">
 <!ENTITY automake-fin-sbu "less than 0.1 SBU (about 9.1 SBU with tests)">
@@ -217,10 +218,11 @@
 <!ENTITY gawk-fin-du "45 MB">
 <!ENTITY gawk-fin-sbu "0.4 SBU">
 
-<!ENTITY gcc-version "11.1.0">
-<!ENTITY gcc-size "77,032 KB">
+<!ENTITY gcc-version "11.2.0">
+<!ENTITY gcc-size "78,996 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
-<!ENTITY gcc-md5 "77f6252be0861ab918042acf42bc10ff">
+<!ENTITY gcc-md5 "31c86f2ced76acac66992eeedce2fce2">
+<!ENTITY gcc-sha256 "d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b">
 <!ENTITY gcc-home "https://gcc.gnu.org/">
 <!ENTITY gcc-tmpp1-du "3.7 GB">
 <!ENTITY gcc-tmpp1-sbu "11 SBU">
@@ -327,10 +329,11 @@
 <!ENTITY iana-etc-fin-du "4.7 MB">
 <!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY inetutils-version "2.0">
-<!ENTITY inetutils-size "1,462 KB">
+<!ENTITY inetutils-version "2.1">
+<!ENTITY inetutils-size "1,496 KB">
 <!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.xz">
-<!ENTITY inetutils-md5 "5e1018502cd131ed8e42339f6b5c98aa">
+<!ENTITY inetutils-md5 "4e7676d1980e57c7df665e5c5c3c1047">
+<!ENTITY inetutils-sha256 "01b9a4bc73a47e63f6e8a07b76122d9ad2a2e46ebf14870e9c91d660b5647a22">
 <!ENTITY inetutils-home "&gnu-software;inetutils/">
 <!ENTITY inetutils-fin-du "31 MB">
 <!ENTITY inetutils-fin-sbu "0.3 SBU">