diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index ec2a431ae4..91e9709f0c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,10 @@
    <listitem>
      <para>March 30th, 2023</para>
      <itemizedlist>
+       <listitem>
+         <para>[renodr] - Update to xorg-server-21.1.8 (Security Update). Fixes
+         <ulink url="&blfs-ticket-root;17882">#17882</ulink>.</para>
+       </listitem>
        <listitem>
          <para>[renodr] - Update to xfce4-pulseaudio-plugins-0.4.6. Fixes
          <ulink url="&blfs-ticket-root;17875">#17875</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 1c7175d65f..5726ccbad0 100644
--- a/packages.ent
+++ b/packages.ent
@@ -774,7 +774,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY xcursor-themes-version       "1.0.7">
 <!ENTITY xkeyboard-config-version     "2.38">
 <!ENTITY xwayland-version             "23.1.0">
-<!ENTITY xorg-server-version          "21.1.7">
+<!ENTITY xorg-server-version          "21.1.8">
 <!ENTITY twm-version                  "1.0.12">
 <!ENTITY xterm-version                "379">
 <!ENTITY xclock-version               "1.1.1">
diff --git a/x/installing/xorg-server.xml b/x/installing/xorg-server.xml
index d0f9df8583..f510ac6bca 100644
--- a/x/installing/xorg-server.xml
+++ b/x/installing/xorg-server.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.xz">
   <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.xz">
-  <!ENTITY xorg-server-md5sum        "277a842f1e223820a31a9bd7887d2aab">
+  <!ENTITY xorg-server-md5sum        "79a6eb04b1b17ad6c7aab46da73944e8">
   <!ENTITY xorg-server-size          "4.8 MB">
-  <!ENTITY xorg-server-buildsize     "187 MB (with tests)">
-  <!ENTITY xorg-server-time          "0.4 SBU (using parallelism=4; with tests)">
+  <!ENTITY xorg-server-buildsize     "188 MB (with tests)">
+  <!ENTITY xorg-server-time          "0.6 SBU (using parallelism=4; with tests)">
 ]>
 
 <sect1 id="xorg-server" xreflabel="Xorg-Server-&xorg-server-version;">