diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 0b31bc8324c..de2eefdb851 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,14 +1,15 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=1.20.8
-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
  -Dxkb_output_dir=/var/lib/xkb -Dfont_root_dir=/usr/share/fonts/X11
  -Ddmx=true -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true
  -Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false)
- -Dos_vendor=Void"
+ -Dos_vendor=Void -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true
+ -Dxwayland=true"
 hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
@@ -25,27 +26,16 @@ homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
 checksum=d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146
 lib32disabled=yes
-provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-24_1 xf86-video-modesetting-1_1"
-replaces="xf86-video-modesetting>=0"
-subpackages="xorg-server-devel xorg-server-xdmx xorg-server-xephyr xorg-server-xnest xorg-server-xvfb"
+provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
+ xserver-abi-video-24_1 xf86-video-modesetting-1_1"
+replaces="xf86-video-modesetting>=0 glamor-egl>=0"
+subpackages="xorg-server-devel xorg-server-xdmx xorg-server-xephyr
+ xorg-server-xnest xorg-server-xvfb xorg-server-xwayland"
 conf_files="/etc/X11/Xwrapper.config"
 
 build_options="elogind"
 desc_option_elogind="Rootless Xorg support with elogind"
 
-case "$XBPS_TARGET_MACHINE" in
-i686*|x86_64*|aarch64*|ppc*|armv7l*)
-	# Enable glamor/dri/opengl/xwayland by default.
-	configure_args+=" -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true -Dxwayland=true"
-	replaces+=" glamor-egl>=0"
-	subpackages+=" xorg-server-xwayland"
-	;;
-*)
-	# Enable dri2 on !x86 via libdri.
-	configure_args+=" -Dglx=true -Ddri1=false -Ddri2=true -Ddri3=true -Dxwayland=false"
-	;;
-esac
-
 # disable VBE on non-x86 systems
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*) configure_args+=" -Dint10=x86emu -Dvbe=true" ;;