diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index c7905e35cd2..5bf77b4918d 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.6
-revision=3
+version=1.20.7
+revision=1
 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
@@ -23,7 +23,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
-checksum=6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1
+checksum=bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1
 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"
@@ -46,6 +46,12 @@ i686*|x86_64*|aarch64*|ppc*|armv7l*)
 	;;
 esac
 
+# disable VBE on non-x86 systems
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*) configure_args+=" -Dint10=x86emu -Dvbe=true" ;;
+	*) configure_args+=" -Dint10=false -Dvbe=false" ;;
+esac
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 	# required when secure_rpc is enabled and not using glibc for rpc/rpc.h