diff --git a/srcpkgs/xorg-server/INSTALL b/srcpkgs/xorg-server/INSTALL
index 9aa5ff171fd..60e08f68d25 100644
--- a/srcpkgs/xorg-server/INSTALL
+++ b/srcpkgs/xorg-server/INSTALL
@@ -1,7 +1,7 @@
 # Create libglx-xorg.so libglx.so symlink for Mesa.
 case ${ACTION} in
 post)
-	if [ ! -e usr/lib/xorg/modules/extensions/libglx.so ]; then
+	if [ -d usr/lib/xorg/modules/extensions -a ! -e usr/lib/xorg/modules/extensions/libglx.so ]; then
 		cd usr/lib/xorg/modules/extensions
 		ln -sf libglx-xorg.so libglx.so
 	fi
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 59f04e08a68..beedc35d241 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.13.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
  --enable-xnest --enable-xephyr --enable-composite --enable-xvfb
@@ -98,7 +98,7 @@ xorg-server-devel_package() {
 	if [ "$build_option_opengl" ]; then
 		depends+=" MesaLib-devel"
 	fi
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
@@ -111,8 +111,6 @@ xorg-server_package() {
 	provides="xserver-abi-extension-7 xserver-abi-input-18 xserver-abi-video-13"
 	depends="xkeyboard-config"
 	pkg_install() {
-		vmove etc
-		vmove usr
-		vmove var
+		vmove all
 	}
 }