diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a548768c8..5bf6fa9ec 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,29 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2021-07-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Patch gcc to fix some regressions (will be
+          needed to build firefox-91ESR in BLFS) and to allow it to
+          build against linux-5.13.0 kernel headers. Fixes
+          <ulink url="&lfs-ticket-root;4875">#4875</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2021-06-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - If installing individual locales, add 9 more
+          used by libstdc++-v3 tests. Fixes
+          <ulink url="&lfs-ticket-root;4877">#4877</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2021-06-27</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index d77cb7e41..41d3879a8 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -281,6 +281,9 @@
     <!--<listitem>
       <para>meson-0.56.0-upstream_fix-1.patch</para>
     </listitem>-->
+    <listitem>
+      <para>gcc-11.1.0-upstream_fixes-1.patch</para>
+    </listitem>
     <listitem>
       <para>systemd-247-upstream_fixes-2.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 29e6cb127..3dd115094 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -67,15 +67,15 @@
         <para>MD5 sum: <literal>&glibc-fhs-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-<!--
+
     <varlistentry>
-      <term>GCC Cross Build Fix Patch - <token>&gcc-cross-patch-size;</token>:</term>
+      <term>GCC Upstream Fixes Patch - <token>&gcc-upstream-fixes-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&gcc-cross-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-cross-patch-md5;</literal></para>
+        <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 96be76734..7dc3e10b5 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -41,7 +41,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
 
-    <para arch="default">If building on x86_64, change the default directory name for 64-bit
+    <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>
 
 <screen arch="default"><userinput remap="pre">case $(uname -m) in
@@ -139,10 +144,16 @@ 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>Six tests related to get_time are known to fail.  These are
-    apparently related to the en_HK locale.</para>
+    <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>
 
-    <para>Additionally, three tests in constexpr-52830 are known to fail.</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>
 
 <!--<para>Additionally the following tests related to the following files
     are known to fail with glibc-2.33: asan_test.C, co-ret-17-void-ret-coro.C, 
@@ -168,6 +179,7 @@ su tester -c "PATH=$PATH make -k check"</userinput></screen>
       is not enabled in the kernel even though it is present on the CPU.
     </para></note-->
 
+    <!-- PR 91085, will be fixed in GCC 12. -->
     <para>Install the package and remove an unneeded directory:</para>
 
 <screen><userinput remap="install">make install
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index c6d800fb2..936a8b083 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -265,26 +265,35 @@ localedef -i de_DE -f ISO-8859-1 de_DE
 localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
 localedef -i de_DE -f UTF-8 de_DE.UTF-8
 localedef -i el_GR -f ISO-8859-7 el_GR
+localedef -i en_GB -f ISO-8859-1 en_GB
 localedef -i en_GB -f UTF-8 en_GB.UTF-8
 localedef -i en_HK -f ISO-8859-1 en_HK
 localedef -i en_PH -f ISO-8859-1 en_PH
 localedef -i en_US -f ISO-8859-1 en_US
 localedef -i en_US -f UTF-8 en_US.UTF-8
+localedef -i es_ES -f ISO-8859-15 es_ES@euro
 localedef -i es_MX -f ISO-8859-1 es_MX
 localedef -i fa_IR -f UTF-8 fa_IR
 localedef -i fr_FR -f ISO-8859-1 fr_FR
 localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
 localedef -i fr_FR -f UTF-8 fr_FR.UTF-8
+localedef -i is_IS -f ISO-8859-1 is_IS
+localedef -i is_IS -f UTF-8 is_IS.UTF-8
 localedef -i it_IT -f ISO-8859-1 it_IT
+localedef -i it_IT -f ISO-8859-15 it_IT@euro
 localedef -i it_IT -f UTF-8 it_IT.UTF-8
 localedef -i ja_JP -f EUC-JP ja_JP
 localedef -i ja_JP -f SHIFT_JIS ja_JP.SIJS 2> /dev/null || true
 localedef -i ja_JP -f UTF-8 ja_JP.UTF-8
+localedef -i nl_NL@euro -f ISO-8859-15 nl_NL@euro
 localedef -i ru_RU -f KOI8-R ru_RU.KOI8-R
 localedef -i ru_RU -f UTF-8 ru_RU.UTF-8
+localedef -i se_NO -f UTF-8 se_NO.UTF-8
+localedef -i ta_IN -f UTF-8 ta_IN.UTF-8
 localedef -i tr_TR -f UTF-8 tr_TR.UTF-8
 localedef -i zh_CN -f GB18030 zh_CN.GB18030
-localedef -i zh_HK -f BIG5-HKSCS zh_HK.BIG5-HKSCS</userinput></screen>
+localedef -i zh_HK -f BIG5-HKSCS zh_HK.BIG5-HKSCS
+localedef -i zh_TW -f UTF-8 zh_TW.UTF-8</userinput></screen>
 
     <para>In addition, install the locale for your own country, language and
     character set.</para>
diff --git a/patches.ent b/patches.ent
index 48c6184eb..bf849b05e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -29,11 +29,11 @@
 <!ENTITY flex-fixes-patch-md5 "b46f6b0380e502a3dfb8b503227cd680">
 <!ENTITY flex-fixes-patch-size "3.4 KB">
 -->
-<!--
-<!ENTITY gcc-cross-patch "gcc-&gcc-version;-cet_fix-1.patch">
-<!ENTITY gcc-cross-patch-md5 "f37d8a6b4c943a6f8eaf541923fed838">
-<!ENTITY gcc-cross-patch-size "4.3 KB">
--->
+
+<!ENTITY gcc-upstream-fixes-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
+<!ENTITY gcc-upstream-fixes-patch-md5 "27266d2a771f2ff812cb6ec9c8b456b4">
+<!ENTITY gcc-upstream-fixes-patch-size "18.0 KB">
+
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">