diff --git a/srcpkgs/xorg-server-xwayland b/srcpkgs/xorg-server-xwayland
deleted file mode 120000
index 0e680f217e7..00000000000
--- a/srcpkgs/xorg-server-xwayland
+++ /dev/null
@@ -1 +0,0 @@
-xorg-server
\ No newline at end of file
diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
new file mode 100644
index 00000000000..2bc4ff38b1c
--- /dev/null
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -0,0 +1,27 @@
+# Template file for 'xorg-server-xwayland'
+pkgname=xorg-server-xwayland
+version=21.1.1
+revision=1
+wrksrc="xserver-xwayland-$version"
+build_style=meson
+configure_args="-Dipv6=true -Dxvfb=false -Dxdmcp=false -Dxcsecurity=true
+ -Ddri3=true -Dxwayland_eglstream=false -Dglamor=true -Dxkb_dir=/usr/share/X11/xkb
+ -Dxkb_output_dir=/var/lib/xkb"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="nettle-devel libepoxy-devel font-util libXfont2-devel pixman-devel
+ libxkbfile-devel dbus-devel wayland-devel wayland-protocols libtirpc-devel
+ MesaLib-devel libxcb-devel"
+depends="xorg-server-common"
+short_desc="Nested X server that runs as a wayland client"
+maintainer="Paper <paper@tilde.institute>"
+license="MIT"
+homepage="https://xorg.freedesktop.org"
+distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
+checksum=f93c8a92d1f8eabde40713c7af01200a9040b3b73eafba54589732dac0a937fe
+
+post_install() {
+	# protocol.txt is provided by xorg-server-common
+	rm ${DESTDIR}/usr/lib/xorg/protocol.txt
+	rm ${DESTDIR}/usr/share/man/man1/Xserver.1
+	vlicense COPYING
+}
diff --git a/srcpkgs/xorg-server-xwayland/update b/srcpkgs/xorg-server-xwayland/update
new file mode 100644
index 00000000000..960c2c0b263
--- /dev/null
+++ b/srcpkgs/xorg-server-xwayland/update
@@ -0,0 +1 @@
+pkgname=xserver-xwayland