diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index c7cb7a99f5..dc7cae73a5 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,12 +43,17 @@
    <listitem>
      <para>May 7th, 2021</para>
      <itemizedlist>
+       <listitem>
+         <para>[bdubbs] - Update to mesa-21.1.0. Fixes
+         <ulink url="&blfs-ticket-root;14758">#14758</ulink>.</para>
+       </listitem>
        <listitem>
          <para>[timtas] - Update to thunar-4.16.7. Fixes
          <ulink url="&blfs-ticket-root;15003">#15003</ulink>.</para>
        </listitem>
-      </itemizedlist>
-    </listitem>
+     </itemizedlist>
+   </listitem>
+    
    <listitem>
      <para>May 6th, 2021</para>
      <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 7eec929f9e..aa85bfe0b3 100644
--- a/packages.ent
+++ b/packages.ent
@@ -697,8 +697,8 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY xbitmaps-version             "1.1.2">
 <!ENTITY xcursor-themes-version       "1.0.6">
 <!ENTITY xkeyboard-config-version     "2.32">
-<!ENTITY mesa-major-minor             "20.3">
-<!ENTITY mesa-version                 "&mesa-major-minor;.4">
+<!ENTITY mesa-major-minor             "21.1">
+<!ENTITY mesa-version                 "&mesa-major-minor;.0">
 <!ENTITY xcb-util-version             "0.4.0">
 <!ENTITY xcb-util-image-version       "0.4.0">
 <!ENTITY xcb-util-keysyms-version     "0.4.0">
diff --git a/x/installing/mesa.xml b/x/installing/mesa.xml
index 4038111414..ee29bb0996 100644
--- a/x/installing/mesa.xml
+++ b/x/installing/mesa.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY mesa-download-http "https://mesa.freedesktop.org/archive/mesa-&mesa-version;.tar.xz">
   <!ENTITY mesa-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/mesa-&mesa-version;.tar.xz">
-  <!ENTITY mesa-md5sum        "556338446aef8ae947a789b3e0b5e056">
+  <!ENTITY mesa-md5sum        "add66f785a8e60398215dc7431b482b1">
   <!ENTITY mesa-size          "14 MB">
-  <!ENTITY mesa-buildsize     "676 MB (with docs), add 319 MB for tests">
-  <!ENTITY mesa-time          "2.9 SBU (with parallelism=4 and docs). Add 0.5 SBU for tests">
+  <!ENTITY mesa-buildsize     "539 MB (with docs)">
+  <!ENTITY mesa-time          "3.1 SBU (with parallelism=4 and docs)">
 ]>
 
 <sect1 id="mesa" xreflabel="Mesa-&mesa-version;">
@@ -235,7 +235,7 @@ meson --prefix=$XORG_PREFIX          \
       -Dgallium-drivers=$GALLIUM_DRV \
       -Dgallium-nine=false           \
       -Dglx=dri                      \
-      -Dosmesa=gallium               \
+      -Dosmesa=true                  \
       -Dvalgrind=disabled            \
       -Dlibunwind=disabled           \
       ..                             &amp;&amp;
@@ -244,12 +244,16 @@ unset GALLIUM_DRV DRI_DRIVERS &amp;&amp;
 
 ninja</userinput></screen>
 
+    <para>
+      This package no longer comes with a test suite.
+    </para>
+<!--
     <para>
       If you built the tests (see 'Command Explanations'), to run them issue:
       <command>ninja test</command>. 
       Two tests in the llvmpipe suite are known to fail.
     </para>
-
+-->
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
@@ -294,7 +298,7 @@ cp -rfv ../docs/* /usr/share/doc/mesa-&mesa-version;</userinput></screen>
     </para>
 
     <para>
-      <parameter>-Dosmesa=gallium</parameter>: This switch enables building
+      <parameter>-Dosmesa=true</parameter>: This switch disables building
       the <filename class="libraryfile">libOSMesa</filename> library and
       provides Gallium3D support in it. It requires the swrast gallium driver.
     </para>