diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index e6082b445ea..1efed0c56ba 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,45 +1,39 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.19.6
-revision=4
+version=1.20.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-record --enable-xorg
  --enable-xnest --enable-xephyr --enable-composite --enable-xvfb
- --disable-static --disable-config-hal --disable-xfbdev --disable-xfake
- --enable-config-udev --enable-config-udev-kms
- --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
- --with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto
- --enable-dmx --enable-kdrive-mouse
- --enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd
- --disable-linux-acpi --disable-linux-apm
- --enable-suid-wrapper --with-shared-memory-dir=/dev/shm
+ --disable-static --disable-config-hal --enable-config-udev
+ --enable-config-udev-kms --with-xkb-path=/usr/share/X11/xkb
+ --with-xkb-output=/var/lib/xkb --with-fontrootdir=/usr/share/fonts/X11
+ --with-sha1=libcrypto --enable-dmx --enable-kdrive --disable-linux-acpi
+ --disable-linux-apm --enable-suid-wrapper --with-shared-memory-dir=/dev/shm
  --without-systemd-daemon --enable-xcsecurity"
+hostmakedepends="flex perl pkg-config"
+makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
+ libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
+ libdmx-devel libdri2-devel-git libepoxy-devel libressl-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"
+# See hw/xfree86/common/xf86Module.h. Only care for the major version.
+depends="xkeyboard-config"
 short_desc="The X11 server from X.org"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://xorg.freedesktop.org"
-license="MIT, BSD"
+license="MIT, BSD-3-Clause"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
-checksum=a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197
-
+checksum=9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6
 lib32disabled=yes
-
-hostmakedepends="pkg-config perl flex"
-makedepends="
- xorgproto xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel 
- eudev-libudev-devel libressl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel
- libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel
- libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel
- libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel libxshmfence-devel
- wayland-devel wayland-protocols libepoxy-devel xcb-util-renderutil-devel
- libXfont2-devel"
-# See hw/xfree86/common/xf86Module.h. Only care for the major version.
-depends="xkeyboard-config"
-provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-23_1 xf86-video-modesetting-1_1"
+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 xorg-server"
+conf_files="/etc/X11/Xwrapper.config"
 
 case "$XBPS_TARGET_MACHINE" in
-i686*|x86_64*)
+i686*|x86_64*|aarch64*)
 	# Enable glamor/dri/opengl/xwayland by default on x86.
 	configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx --enable-xwayland"
 	makedepends+=" MesaLib-devel"
@@ -53,7 +47,6 @@ i686*|x86_64*)
 	;;
 esac
 
-conf_files="/etc/X11/Xwrapper.config"
 
 # Symbols must be resolved lazily for modules to work.
 # See https://bugs.freedesktop.org/show_bug.cgi?id=41208#c5
@@ -66,6 +59,7 @@ pre_configure() {
 		;;
 	esac
 }
+
 post_install() {
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl) vinstall ${FILESDIR}/20-modules.conf 644 usr/share/X11/xorg.conf.d;;
@@ -91,12 +85,14 @@ xorg-server-xdmx_package() {
 		vmove usr/share/man/man1/*dmx*
 	}
 }
+
 xorg-server-xwayland_package() {
 	short_desc="A nested X server that runs as a wayland client"
 	pkg_install() {
 		vmove usr/bin/Xwayland
 	}
 }
+
 xorg-server-xnest_package() {
 	short_desc="A nested X server that runs as an X application"
 	pkg_install() {
@@ -104,6 +100,7 @@ xorg-server-xnest_package() {
 		vmove usr/share/man/man1/Xnest.1
 	}
 }
+
 xorg-server-xephyr_package() {
 	short_desc="X server outputting to a window on a pre-existing X display"
 	pkg_install() {
@@ -111,6 +108,7 @@ xorg-server-xephyr_package() {
 		vmove usr/share/man/man1/Xephyr.1
 	}
 }
+
 xorg-server-xvfb_package() {
 	short_desc="Virtual framebuffer X server"
 	depends="xkeyboard-config"
@@ -119,6 +117,7 @@ xorg-server-xvfb_package() {
 		vmove usr/share/man/man1/Xvfb.1
 	}
 }
+
 xorg-server-devel_package() {
 	depends="${makedepends}"
 	short_desc+=" - development files"