diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 84e43a62df..ac961b06d9 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,10 @@
     <listitem>
       <para>December 15th, 2022</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to xorg-server-21.1.5 (security update). Fixes
+          <ulink url="&blfs-ticket-root;17403">#17403</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[pierre] - Update to xwayland-22.1.6 (security update). Fixes
           <ulink url="&blfs-ticket-root;17404">#17404</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 5c712ac024..8774227139 100644
--- a/packages.ent
+++ b/packages.ent
@@ -655,7 +655,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY xcursor-themes-version       "1.0.6">
 <!ENTITY xkeyboard-config-version     "2.37">
 <!ENTITY xwayland-version             "22.1.6">
-<!ENTITY xorg-server-version          "21.1.4">
+<!ENTITY xorg-server-version          "21.1.5">
 <!ENTITY twm-version                  "1.0.12">
 <!ENTITY xterm-version                "377">
 <!ENTITY xclock-version               "1.1.1">
diff --git a/x/installing/xorg-server.xml b/x/installing/xorg-server.xml
index 51348d6985..3b3490fb2d 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        "1fee73752bc08a9d364d5e39f19f464f">
+  <!ENTITY xorg-server-md5sum        "2dc0ad1aec4b50ff163ec72b54437bdb">
   <!ENTITY xorg-server-size          "4.7 MB">
-  <!ENTITY xorg-server-buildsize     "186 MB (with tests)">
-  <!ENTITY xorg-server-time          "0.5 SBU (using parallelism=4; with tests)">
+  <!ENTITY xorg-server-buildsize     "187 MB (with tests)">
+  <!ENTITY xorg-server-time          "0.4 SBU (using parallelism=4; with tests)">
 ]>
 
 <sect1 id="xorg-server" xreflabel="Xorg-Server-&xorg-server-version;">
@@ -66,18 +66,6 @@
       </listitem>
     </itemizedlist>
 
-<!-- Prime support is now automatically added in DRI3, and this patch
-     may break things on some setups.
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-add_prime_support-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>-->
-
     <bridgehead renderas="sect3">Xorg Server Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -123,21 +111,6 @@
 
   <sect2 role="installation">
     <title>Installation of Xorg Server</title>
-<!-- Patch removed
-    <para>
-      If you have downloaded the optional patch, apply it by running the
-      following command:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>-->
-
-<!-- Not needed with 21.1.4
-    <para>
-      Fix an issue with gcc-12 and later:
-    </para>
-
-<screen><userinput>sed -i '/(SourcePictPtr)/s/sizeof([^)]*)/sizeof(SourcePict)/' render/picture.c</userinput></screen>
--->
 
     <para>
       Install the server by running the following commands:
@@ -177,15 +150,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-<!-- built by default now
-    <para>
-      <parameter>- -enable-glamor</parameter>: Build the Glamor DIX (Device
-      Independent X) module which is currently used by: R600 or later radeon
-      video chipsets, the modesetting driver (which is part of this package)
-      for hardware using KMS which offers acceleration, and (optionally) the
-      intel driver.
-    </para>
--->
+
     <para>
       <parameter>-Dsuid_wrapper=true</parameter>: Builds the suid-root
       wrapper for legacy driver support on rootless xserver systems.
@@ -198,14 +163,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
       to work without having the <phrase revision="systemd">systemd</phrase>
       <phrase revision="elogind">elogind</phrase> PAM module configured.
     </para>
-<!-- seems to be completely removed with meson build:
-    <para>
-      <option>- -enable-install-setuid</option>:
-      This switch restores the setuid bit to the Xorg executable allowing Xorg
-      Server to work with a virtual terminal designated on the
-      <command>startx</command> command line.
-    </para>
--->
+
     <para revision="sysv">
       <command>cat &gt;&gt; /etc/sysconfig/createfiles...</command>: This
       command creates the <filename class="directory">/tmp/.ICE-unix</filename>
@@ -252,31 +210,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-<!-- Now in libxcvt:
-      <varlistentry id="cvt-x7">
-        <term><command>cvt</command></term>
-        <listitem>
-          <para>
-            calculates VESA CVT mode lines
-          </para>
-          <indexterm zone="xorg-server cvt-x7">
-            <primary sortas="b-cvt">cvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-Removed in this release:
-      <varlistentry id="dmx-x7">
-        <term><command>dmx*</command></term>
-        <listitem>
-          <para>
-            are various tools used for manipulating the dmx server
-          </para>
-          <indexterm zone="xorg-server dmx-x7">
-            <primary sortas="b-dmx">dmx*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry id="gtf-x7">
         <term><command>gtf</command></term>
         <listitem>
@@ -288,20 +222,7 @@ Removed in this release:
           </indexterm>
         </listitem>
       </varlistentry>
-<!-- No dmx in this release
-      <varlistentry id="vdltodmx-x7">
-        <term><command>vdltodmx</command></term>
-        <listitem>
-          <para>
-            is a tool used to convert VDL config files to DMX config
-            files
-          </para>
-          <indexterm zone="xorg-server vdltodmx-x7">
-            <primary sortas="b-vdltodmx">vdltodmx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry id="X-x7">
         <term><command>X</command></term>
         <listitem>
@@ -313,20 +234,7 @@ Removed in this release:
           </indexterm>
         </listitem>
       </varlistentry>
-<!-- No dmx in this release
-     <varlistentry id="Xdmx">
-        <term><command>Xdmx</command></term>
-        <listitem>
-          <para>
-            is a proxy X server that uses one or more other X servers as
-            its display devices
-          </para>
-          <indexterm zone="xorg-server Xdmx">
-            <primary sortas="b-Xdmx">Xdmx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry id="Xephyr-x7">
         <term><command>Xephyr</command></term>
         <listitem>
@@ -374,33 +282,7 @@ Removed in this release:
           </indexterm>
         </listitem>
       </varlistentry>
-<!-- No dmx in this release
-      <varlistentry id="xdmxconfig-x7">
-        <term><command>xdmxconfig</command></term>
-        <listitem>
-          <para>
-            is a graphical configuration utility for the dmx server
-          </para>
-          <indexterm zone="xorg-server xdmxconfig-x7">
-            <primary sortas="b-xdmxconfig">xdmxconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-Xwayland has been separated to xwayland package
-      <varlistentry id="Xwayland-x7">
-        <term><command>Xwayland</command></term>
-        <listitem>
-          <para>
-            allows the X server to run X clients under wayland (i.e. wayland
-            provides the input devices and handles the presentation of the
-            windows)
-          </para>
-          <indexterm zone="xorg-server Xwayland-x7">
-            <primary sortas="b-Xwayland">Xwayland</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry id="modesetting_drv-x7">
         <term><filename class="libraryfile">modesetting_drv.so</filename></term>
         <listitem>