diff --git a/general/prog/gcc.xml b/general/prog/gcc.xml
index 139f364870..af433f5698 100644
--- a/general/prog/gcc.xml
+++ b/general/prog/gcc.xml
@@ -6,12 +6,12 @@
 
   <!ENTITY gcc-download-http  "&gnu-http;/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
   <!ENTITY gcc-download-ftp   "&gnu-ftp;/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
-  <!ENTITY gcc-md5sum         "77f6252be0861ab918042acf42bc10ff">
-  <!ENTITY gcc-size           "75 MB">
-  <!ENTITY gcc-buildsize      "10.1 GB (2.4 GB installed with all listed languages; add 1.3 GB for tests)">
+  <!ENTITY gcc-md5sum         "31c86f2ced76acac66992eeedce2fce2">
+  <!ENTITY gcc-size           "77 MB">
+  <!ENTITY gcc-buildsize      "8.0 GB (2.4 GB installed with all listed languages; add 1.0 GB for tests)">
   <!-- For me the SBU values are a bit faster on haswell, but much slower on ryzen 3400G,
        so keeping these existing values as an approximation - ken -->
-  <!ENTITY gcc-time           "28 SBU (with parallelism=4, add 73 SBU for tests with parallelism=4)">
+  <!ENTITY gcc-time           "26 SBU (add 56 SBU for tests; both with parallelism=4)">
 ]>
 
 <sect1 id="gcc" xreflabel="GCC-&gcc-version;">
@@ -228,6 +228,9 @@ to be run. -->
 
 <screen><userinput>../contrib/test_summary</userinput></screen>
 
+    <para>A few tests, less than 20 out of about 450,000, will fail, but unless
+    the failures are excessive, they can be ignored.</para>
+
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index ac95cab44f..f4ace6e237 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>August 1st, 2021</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gcc-11.2.0. Fixes
+          <ulink url="&blfs-ticket-root;15322">#15322</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to btrfs-progs-v5.13.1. Fixes
           <ulink url="&blfs-ticket-root;15334">#15334</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 3db4e7216a..7d5f8217b2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -340,7 +340,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY doxygen-version              "1.9.1">
 <!ENTITY elfutils-version             "0.170">
 <!ENTITY expect-version               "5.45.4">
-<!ENTITY gcc-version                  "11.1.0">
+<!ENTITY gcc-version                  "11.2.0">
 <!ENTITY gc-version                   "8.0.4">
 <!ENTITY gdb-version                  "10.2">
 <!ENTITY git-version                  "2.32.0">