diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 17cb070a32..eb6de715ab 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -38,6 +38,16 @@
       </itemizedlist>
     </listitem>
     -->
+    <listitem>
+      <para>January 14th, 2023</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to mesa-22.3.3. Fixes
+          <ulink url="&blfs-ticket-root;17504">#17504</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>January 13th, 2023</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 3305f24780..73f3be94e5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -653,7 +653,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY xcb-util-wm-version          "0.4.2">
 <!ENTITY xcb-util-cursor-version      "0.1.4">
 <!ENTITY mesa-major-minor             "22.3">
-<!ENTITY mesa-version                 "&mesa-major-minor;.2">
+<!ENTITY mesa-version                 "&mesa-major-minor;.3">
 <!ENTITY xbitmaps-version             "1.1.2">
 <!ENTITY xcursor-themes-version       "1.0.6">
 <!ENTITY xkeyboard-config-version     "2.37">
diff --git a/x/installing/mesa.xml b/x/installing/mesa.xml
index 45586b6ee4..4a6a4d5ca0 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        "f299f32fc3f48db392b12cdfd83fa4fd">
+  <!ENTITY mesa-md5sum        "3cee19ea4d800e6ca8570d1f9ab1482d">
   <!ENTITY mesa-size          "16 MB">
-  <!ENTITY mesa-buildsize     "372 MB (with docs, add 284 MB for tests)">
-  <!ENTITY mesa-time          "2.2 SBU (Using parallelism=4; with docs, add 0.5 SBU for tests)">
+  <!ENTITY mesa-buildsize     "453 MB (with docs, add 203 MB for tests)">
+  <!ENTITY mesa-time          "2.5 SBU (Using parallelism=4; with docs, add 0.6 SBU for tests)">
 ]>
 
 <sect1 id="mesa" xreflabel="Mesa-&mesa-version;">
@@ -241,7 +241,8 @@ DRI_DRIVERS="i965,nouveau"</userinput></screen>
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
-meson --prefix=$XORG_PREFIX   \
+meson setup                   \
+      --prefix=$XORG_PREFIX   \
       --buildtype=release     \
       -Dplatforms=x11,wayland \
       -Dgallium-drivers=auto  \
@@ -249,24 +250,14 @@ meson --prefix=$XORG_PREFIX   \
       -Dvalgrind=disabled     \
       -Dlibunwind=disabled    \
       ..                      &amp;&amp;
-<!-- Removed for 22.2.1: seems to be the default  -Dglx=dri      \ -->
+
 ninja</userinput></screen>
 
     <para>
       If you built the tests (see 'Command Explanations'), to run them issue:
       <command>ninja test</command>.
     </para>
-<!-- All tests passed for me for 21.2.4 [pierre]
-     All 33 subtests tests in the mesa:compiler+glsl / glsl compiler warnings
-      suite are known to fail.
-
-     For 22.1.0:
-     Ok:                 74
-     Expected Fail:      0
-     Fail:               0
-     Unexpected Pass:    0
-     Skipped:            0
-     Timeout:            0
+<!-- All 88 tests passed for me for 22.3.3 [pierre]
 -->
 
     <para>
@@ -365,8 +356,8 @@ cp -rfv ../docs/* /usr/share/doc/mesa-&mesa-version;</userinput></screen>
           libGL.so,
           libGLESv1_CM.so,
           libGLESv2.so,
-          libXvMCnouveau.so,
-          libXvMCr600.so,
+<!--          libXvMCnouveau.so,
+          libXvMCr600.so,-->
           libgbm.so,
           libglapi.so, and
           libxatracker.so
@@ -388,6 +379,7 @@ cp -rfv ../docs/* /usr/share/doc/mesa-&mesa-version;</userinput></screen>
           radeonsi_drv_video.so,
           swrast_dri.so,
           virtio_gpu_dri.so,
+          virtio_gpu_drv_video.so,
           vmwgfx_dri.so,
           <!-- End DRI Drivers -->
           <!-- Begin VDPAU drivers -->
@@ -395,6 +387,7 @@ cp -rfv ../docs/* /usr/share/doc/mesa-&mesa-version;</userinput></screen>
           libvdpau_r300.so
           libvdpau_r600.so, and
           libvdpau_radeonsi.so
+          libvdpau_virtio_gpu.so
           <!-- End VDPAU drivers -->
           (Many of these drivers are hard-linked).
         </seg>