diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06ba08a959..d74b415e99 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -76,9 +76,8 @@ Add_dependency full xkeyboard-config
 
 post_install()
 {
-	install -m644 -D ${FILESDIR}/x11-input.rules \
-		${DESTDIR}/etc/udev/rules.d/75-x11-input.rules
-	install -d ${DESTDIR}/etc/X11/xorg.conf.d
-	install -m644 ${FILESDIR}/*.conf ${DESTDIR}/etc/X11/xorg.conf.d
+	vinstall ${FILESDIR}/x11-input.rules 644 \
+		etc/udev/rules.d 75-x11-input.rules
+	vinstall ${FILESDIR}/11-quirks.conf 644 etc/X11/xorg.conf.d
 	rm -rf ${DESTDIR}/var/log
 }
diff --git a/srcpkgs/xorg-server/xorg-server-devel.template b/srcpkgs/xorg-server/xorg-server-devel.template
index ffb1b05df1..148d080a83 100644
--- a/srcpkgs/xorg-server/xorg-server-devel.template
+++ b/srcpkgs/xorg-server/xorg-server-devel.template
@@ -5,11 +5,14 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run pkg-config
 Add_dependency run perl			">=0"
 Add_dependency run flex
 Add_dependency run libudev-devel
 Add_dependency run dri2proto		">=2.1"
+Add_dependency run glproto
 Add_dependency run xf86driproto
 Add_dependency run randrproto
 Add_dependency run videoproto
@@ -40,8 +43,7 @@ Add_dependency run xorg-server
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/aclocal usr/share
 }