diff --git a/srcpkgs/xorg-server/files/20-modules.conf b/srcpkgs/xorg-server/files/20-modules.conf
new file mode 100644
index 00000000000..33b92164617
--- /dev/null
+++ b/srcpkgs/xorg-server/files/20-modules.conf
@@ -0,0 +1,12 @@
+Section "Module"
+	Load "exa"
+	Load "glx"
+	Load "int10"
+	Load "vbe"
+	Load "fb"
+	Load "shadowfb"
+	Load "shadow"
+	Load "vgahw"
+	Load "evdev"
+	Load "glamoregl"
+EndSection
diff --git a/srcpkgs/xorg-server/files/nvidia-drm-outputclass.conf b/srcpkgs/xorg-server/files/30-nvidia-drm-outputclass.conf
similarity index 100%
rename from srcpkgs/xorg-server/files/nvidia-drm-outputclass.conf
rename to srcpkgs/xorg-server/files/30-nvidia-drm-outputclass.conf
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 3808f8d6ba5..924bf5aaf57 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=12
+revision=13
 build_pie=yes
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-record --enable-xorg
@@ -74,7 +74,8 @@ pre_configure() {
 	esac
 }
 post_install() {
-	vinstall ${FILESDIR}/nvidia-drm-outputclass.conf 644 usr/share/X11/xorg.conf.d
+	vinstall ${FILESDIR}/20-modules.conf 644 usr/share/X11/xorg.conf.d
+	vinstall ${FILESDIR}/30-nvidia-drm-outputclass.conf 644 usr/share/X11/xorg.conf.d
 	vinstall ${FILESDIR}/Xwrapper.config 644 etc/X11
 
 	vinstall COPYING 644 usr/share/licenses/${pkgname}