diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 3406873fb0..12331d575a 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.18.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-record --enable-xorg
  --enable-xnest --enable-xephyr --enable-composite --enable-xvfb
@@ -55,6 +55,10 @@ 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
+LDFLAGS="-Wl,z,lazy"
+
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -62,9 +66,6 @@ pre_configure() {
 		sed -i -e 's/termio.h/termios.h/' hw/xfree86/os-support/xf86_OSlib.h
 		;;
 	esac
-	# Symbols must be resolved lazily for modules to work.
-	# See https://bugs.freedesktop.org/show_bug.cgi?id=41208#c5
-	export LDFLAGS="${LDFLAGS//-Wl,-z,now/}"
 }
 post_install() {
 	case "$XBPS_TARGET_MACHINE" in