diff --git a/xorg-server.yaml b/xorg-server.yaml
index fcde4f1f16b..3a1f4ec81ad 100644
--- a/xorg-server.yaml
+++ b/xorg-server.yaml
@@ -1,7 +1,7 @@
 package:
   name: xorg-server
   version: 21.1.14
-  epoch: 3
+  epoch: 4
   description: "X Server"
   copyright:
     - license: SGI-B-2.0
@@ -40,7 +40,7 @@ environment:
       - libxxf86vm-dev
       - mesa-dev
       - mesa-gbm
-      - mesa-gl
+      - mesa-glx
       - mesa-libgallium
       - openssf-compiler-options
       - openssl-dev
@@ -119,7 +119,7 @@ subpackages:
         with:
           repository: https://salsa.debian.org/xorg-team/xserver/xorg-server
           branch: debian-unstable
-          expected-commit: 3146dbd488b8f504ae4bb235b003ce59f5a44a99
+          expected-commit: 8152a2a0ee4de01981730d944b31a8c42591572e
       - working-directory: debian/local
         pipeline:
           - runs: |