diff --git a/srcpkgs/xorg-server-common b/srcpkgs/xorg-server-common
new file mode 120000
index 0000000000..0e680f217e
--- /dev/null
+++ b/srcpkgs/xorg-server-common
@@ -0,0 +1 @@
+xorg-server
\ No newline at end of file
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 7832f45ff7..852c3ab2f5 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=1.20.11
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -9,16 +9,16 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Ddmx=true -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true
  -Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false)
  -Dos_vendor=Void -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true
- -Dxwayland=true"
-hostmakedepends="pkg-config wayland-devel xkbcomp flex"
+ -Dxwayland=false"
+hostmakedepends="pkg-config xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
  libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
- libxkbui-devel pixman-devel wayland-devel wayland-protocols
- xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
- xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
+ libxkbui-devel pixman-devel xcb-util-image-devel xcb-util-keysyms-devel
+ xcb-util-renderutil-devel xcb-util-wm-devel xkbcomp nettle-devel
+ $(vopt_if elogind 'dbus-devel')"
 # See hw/xfree86/common/xf86Module.h. Only care for the major version.
-depends="xkeyboard-config $(vopt_if elogind 'elogind')"
+depends="xkeyboard-config $(vopt_if elogind 'elogind') xorg-server-common"
 checkdepends="xkeyboard-config"
 short_desc="X11 server from X.org"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -77,13 +77,6 @@ xorg-server-xdmx_package() {
 	}
 }
 
-xorg-server-xwayland_package() {
-	short_desc="Nested X server that runs as a wayland client"
-	pkg_install() {
-		vmove usr/bin/Xwayland
-	}
-}
-
 xorg-server-xnest_package() {
 	short_desc="Nested X server that runs as an X application"
 	pkg_install() {
@@ -109,6 +102,13 @@ xorg-server-xvfb_package() {
 	}
 }
 
+xorg-server-common_package() {
+	short_desc+="- common files"
+	pkg_install() {
+		vmove usr/lib/xorg/protocol.txt
+	}
+}
+
 xorg-server-devel_package() {
 	depends="${makedepends}"
 	short_desc+=" - development files"