diff --git a/srcpkgs/xorg-server/INSTALL b/srcpkgs/xorg-server/INSTALL
new file mode 100644
index 0000000000..1ee3c1233a
--- /dev/null
+++ b/srcpkgs/xorg-server/INSTALL
@@ -0,0 +1,7 @@
+# Create libglx-xorg.so libglx.so symlink for Mesa.
+case ${ACTION} in
+post)
+	cd usr/lib/xorg/modules/extensions
+	rm -f libglx.so && ln -sf libglx-xorg.so libglx.so
+	;;
+esac
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index c3050c3ef4..6fd4bc39e2 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.12.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
 --enable-xnest --enable-xephyr --enable-composite --enable-xvfb
@@ -37,4 +37,9 @@ post_install() {
 		etc/udev/rules.d 75-x11-input.rules
 	vinstall ${FILESDIR}/11-quirks.conf 644 etc/X11/xorg.conf.d
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
+
+	# Support nvidia and amd binary blobs to provide their own
+	# implementation.
+	mv ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so \
+		${DESTDIR}/usr/lib/xorg/modules/extensions/libglx-xorg.so
 }