diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index f6eab6c6871..bc1935a4c8d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
 version=1.17.1
-revision=5
+revision=6
 build_pie=yes
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
@@ -44,16 +44,19 @@ replaces="xf86-video-modesetting>=0"
 # Package build options
 build_options="systemd"
 
-if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+case "$XBPS_TARGET_MACHINE" in
+i686*|x86_64*)
 	# Enable glamor/dri/opengl by default on x86.
 	configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx-tls --enable-glx"
 	makedepends+=" MesaLib-devel"
 	replaces="glamor-egl>=0"
-else
+	;;
+*)
 	# Enable dri2 on !x86 via libdri.
 	configure_args+=" --disable-glx --disable-dri --enable-dri2 --enable-dri3"
 	makedepends+=" dri2proto libdri2-devel-git"
-fi
+	;;
+esac
 
 conf_files="/etc/X11/Xwrapper.config"