diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 9509d72216b..f441ef5e38f 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,18 +1,17 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
 version=1.17.1
-revision=9
+revision=10
 build_pie=yes
 build_style=gnu-configure
-configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
+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-libunwind --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
- --disable-dmx --disable-xfree86-utils --enable-dga --enable-xorg
+ --disable-dmx --disable-xfree86-utils --enable-kdrive-mouse
  --enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd
- --enable-kdrive-mouse --enable-xorg --enable-xcsecurity
  --disable-linux-acpi --disable-linux-apm --enable-xwayland
  --enable-suid-wrapper --with-shared-memory-dir=/dev/shm
  $(vopt_enable systemd systemd-logind) $(vopt_with systemd systemd-daemon)"
@@ -45,12 +44,18 @@ replaces="xf86-video-modesetting>=0"
 build_options="systemd"
 
 case "$XBPS_TARGET_MACHINE" in
-i686*|x86_64*)
-	# Enable glamor/dri/opengl by default on x86.
+i686|x86_64)
+	# Enable glx-tls/glamor/dri/opengl by default on x86/glibc.
 	configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx-tls --enable-glx"
 	makedepends+=" MesaLib-devel"
 	replaces+=" glamor-egl>=0"
 	;;
+i686-musl|x86_64-musl)
+	# Enable glx/glamor/dri/opengl by default on x86/musl.
+	configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --disable-glx-tls --enable-glx"
+	makedepends+=" MesaLib-devel"
+	replaces+=" glamor-egl>=0"
+	;;
 *)
 	# Enable dri2 on !x86 via libdri.
 	configure_args+=" --disable-glx --disable-dri --enable-dri2 --enable-dri3"