diff --git a/manifest/armv7l/x/xorg_server.filelist b/manifest/armv7l/x/xorg_server.filelist
index 6e200e93db..bb8cb4fc30 100644
--- a/manifest/armv7l/x/xorg_server.filelist
+++ b/manifest/armv7l/x/xorg_server.filelist
@@ -1,4 +1,4 @@
-# Total size: 8653292
+# Total size: 8655117
 /usr/local/bin/X
 /usr/local/bin/Xephyr
 /usr/local/bin/Xnest
diff --git a/manifest/x86_64/x/xorg_server.filelist b/manifest/x86_64/x/xorg_server.filelist
index a2f43f117c..71efecf480 100644
--- a/manifest/x86_64/x/xorg_server.filelist
+++ b/manifest/x86_64/x/xorg_server.filelist
@@ -1,4 +1,4 @@
-# Total size: 12710295
+# Total size: 12716344
 /usr/local/bin/X
 /usr/local/bin/Xephyr
 /usr/local/bin/Xnest
diff --git a/packages/xorg_server.rb b/packages/xorg_server.rb
index c4b3e79222..f180f78dd7 100644
--- a/packages/xorg_server.rb
+++ b/packages/xorg_server.rb
@@ -3,7 +3,7 @@ require 'buildsystems/meson'
 class Xorg_server < Meson
   description 'The Xorg Server is the core of the X Window system.'
   homepage 'https://gitlab.freedesktop.org/xorg/xserver'
-  version '21.1.21'
+  version '21.1.22'
   license 'BSD-3, MIT, BSD-4, MIT-with-advertising, ISC and custom'
   compatibility 'aarch64 armv7l x86_64'
   source_url 'https://gitlab.freedesktop.org/xorg/xserver.git'
@@ -11,47 +11,50 @@ class Xorg_server < Meson
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: '6232c476e6b6c532388ffc48e7dcc8557d7a728dd812c01815e224f70d96e798',
-     armv7l: '6232c476e6b6c532388ffc48e7dcc8557d7a728dd812c01815e224f70d96e798',
-     x86_64: 'bcf3774f145cdd23f768642641213fae17efeb6584d055f1c0afcbb37eb8c4a3'
+    aarch64: '4047c3058556ea480a37ee2e4b54f73bc2529b520c54a45f0dbfb58ad9caf0cd',
+     armv7l: '4047c3058556ea480a37ee2e4b54f73bc2529b520c54a45f0dbfb58ad9caf0cd',
+     x86_64: '24c4d99d10620c48dd90a080a1da75d0a24fce920934f56d24891fa5122c2e2e'
   })
 
-  depends_on 'dbus' # R
-  depends_on 'eudev' # R
+  depends_on 'dbus' => :executable
+  depends_on 'eudev' => :library
   depends_on 'font_util' => :build
-  depends_on 'gcc_lib' # R
-  depends_on 'glibc' # R
+  depends_on 'gcc_lib' => :build
+  depends_on 'glibc' => :library
   depends_on 'graphite' => :build
-  depends_on 'libbsd' # R
-  depends_on 'libdrm' # R
-  depends_on 'libepoxy' # R
+  depends_on 'libbsd' => :library
+  depends_on 'libdrm' => :library
+  depends_on 'libepoxy' => :library
   depends_on 'libfontenc' => :build
-  depends_on 'libglvnd' # R
+  depends_on 'libglvnd' => :library
   depends_on 'libinput' => :build
-  depends_on 'libmd' # R
-  depends_on 'libpciaccess' # R
-  depends_on 'libtirpc' # R
+  depends_on 'libmd' => :executable
+  depends_on 'libminigbm' => :library
+  depends_on 'libpciaccess' => :executable
+  depends_on 'libtirpc' => :executable
+  depends_on 'libudev_stub' => :library
   depends_on 'libunwind' => :build
-  depends_on 'libx11' # R
-  depends_on 'libxau' # R
-  depends_on 'libxcb' # R
-  depends_on 'libxcvt' # R
-  depends_on 'libxdmcp' # R
-  depends_on 'libxext' # R
-  depends_on 'libxfont2' # R
+  depends_on 'libx11' => :executable
+  depends_on 'libxau' => :executable
+  depends_on 'libxcb' => :executable
+  depends_on 'libxcvt' => :executable
+  depends_on 'libxdmcp' => :library
+  depends_on 'libxext' => :executable
+  depends_on 'libxfont2' => :library
   depends_on 'libxkbcommon' => :build
-  depends_on 'libxkbfile' # R
-  depends_on 'libxshmfence' # R
+  depends_on 'libxkbfile' => :library
+  depends_on 'libxshmfence' => :executable
   depends_on 'libxtrans' => :build
   depends_on 'lzma' => :build
-  depends_on 'mesa' # R
-  depends_on 'pixman' # R
-  depends_on 'xcb_util' # R
+  depends_on 'mesa' => :library
+  depends_on 'pixman' => :library
+  depends_on 'vdev' => :library
+  depends_on 'xcb_util' => :executable
   depends_on 'xcb_util_cursor' => :build
-  depends_on 'xcb_util_image' # R
-  depends_on 'xcb_util_keysyms' # R
-  depends_on 'xcb_util_renderutil' # R
-  depends_on 'xcb_util_wm' # R
+  depends_on 'xcb_util_image' => :executable
+  depends_on 'xcb_util_keysyms' => :executable
+  depends_on 'xcb_util_renderutil' => :executable
+  depends_on 'xcb_util_wm' => :executable
   depends_on 'xcb_util_xrm' => :build
   depends_on 'xkbcomp' => :build
   depends_on 'xorg_proto' => :build
diff --git a/tools/automatically_updatable_packages/xorg_server b/tools/automatically_updatable_packages/xorg_server
new file mode 100644
index 0000000000..e69de29bb2