diff --git a/srcpkgs/xvfb-run/template b/srcpkgs/xvfb-run/template
index 994031975f3..20db1617e24 100644
--- a/srcpkgs/xvfb-run/template
+++ b/srcpkgs/xvfb-run/template
@@ -1,25 +1,21 @@
 # Template file for 'xvfb-run'
 pkgname=xvfb-run
-version=1.20.9.2
+version=21.1.4pl2
 revision=1
-_ver=${version%.*}-${version##*.}
 create_wrksrc=yes
 depends="xorg-server-xvfb xauth"
 short_desc="Xvfb wrapper"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/xorg-team/xserver/xorg-server"
-distfiles="${homepage}/-/raw/xorg-server-2_${_ver}/debian/local/xvfb-run
- ${homepage}/-/raw/xorg-server-2_${_ver}/debian/local/xvfb-run.1"
-checksum="fd05e0f8e6207c3984b980a0f037381c9c4a6f22a6dd94fdcfa995318db2a0a4
- 08f14f55e14e52e5d98713c4d8f25ae68d67e2ee188dc0247770c6ada6e27c05"
-skip_extraction="xvfb-run xvfb-run.1"
+distfiles="${DEBIAN_SITE}/main/x/xorg-server/xorg-server_${version/pl/-}.diff.gz"
+checksum=55996059abde71b2c75d335cf1e9e1e8f39f6b50ee3edc50dd0e9fa11d5bd910
 
-do_extract() {
-	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}{,.1} ${wrksrc}
+post_extract() {
+	patch -Np1 -i "xorg-server_${version/pl/-}.diff"
 }
 
 do_install() {
-	vbin xvfb-run
-	vman xvfb-run.1
+	vbin debian/local/xvfb-run
+	vman debian/local/xvfb-run.1
 }
diff --git a/srcpkgs/xvfb-run/update b/srcpkgs/xvfb-run/update
new file mode 100644
index 00000000000..bf4b91b0cb5
--- /dev/null
+++ b/srcpkgs/xvfb-run/update
@@ -0,0 +1 @@
+pkgname="xorg-server"