diff --git a/xorg-server.yaml b/xorg-server.yaml
new file mode 100644
index 00000000000..b4e4932b1e7
--- /dev/null
+++ b/xorg-server.yaml
@@ -0,0 +1,66 @@
+package:
+  name: xorg-server
+  version: 21.1.9
+  epoch: 0
+  description: "X Server"
+  copyright:
+    - license: SGI-B-2.0
+  dependencies:
+    runtime:
+      - font-misc
+      - xkbcomp
+      - xkeyboard-config
+      - dbus
+      - dbus-x11
+      - systemd
+      - ttf-dejavu
+
+environment:
+  contents:
+    packages:
+      - busybox
+      - build-base
+      - pixman-dev
+      - libdrm
+      - libdrm-dev
+      - libx11-dev
+      - libxext-dev
+      - libxfixes-dev
+      - libxxf86vm-dev
+      - libpciaccess-dev
+      - libgcrypt-dev
+      - libepoxy-dev
+      - libxkbfile-dev
+      - libxfont-dev
+      - libxcvt-dev
+      - libfontenc-dev
+      - zlib-dev
+      - freetype-dev
+      - mesa-dev
+      - mesa-gl
+      - mesa-gbm
+      - autoconf
+      - automake
+
+pipeline:
+  - uses: fetch
+    with:
+      uri: https://www.x.org/releases/individual/xserver/xorg-server-${{package.version}}.tar.xz
+      expected-sha256: ff697be2011b4c4966b7806929e51b7a08e9d33800d505305d26d9ccde4b533a
+
+  - uses: autoconf/configure
+    with:
+      opts: |
+        --prefix=/usr \
+        --with-default-font-path=/usr/share/fonts/misc \
+        --with-xkb-path=/usr/local/share/X11/xkb \
+        --mandir=/usr/share/man
+
+  - uses: autoconf/make
+
+  - uses: autoconf/make-install
+
+update:
+  enabled: true
+  release-monitor:
+    identifier: 5250