diff --git a/templates/xorg-server/devel.template b/templates/xorg-server/devel.template
index 057535d579d..a224eb73b81 100644
--- a/templates/xorg-server/devel.template
+++ b/templates/xorg-server/devel.template
@@ -1,5 +1,6 @@
 # Template file for 'xorg-server-devel'.
 #
+revision=1
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
@@ -10,16 +11,7 @@ Add_dependency run xorg-server
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/lib/xorg/modules/extensions
-	mkdir -p ${DESTDIR}/usr/lib/xorg/modules/linux
-	mkdir -p ${DESTDIR}/usr/lib/xorg/modules/multimedia
-
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	for dir in modules modules/extensions modules/linux \
-		modules/multimedia; do
-		mv ${SRCPKGDESTDIR}/usr/lib/xorg/${dir}/*.la \
-			${DESTDIR}/usr/lib/xorg/${dir}
-	done
 	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
 }
diff --git a/templates/xorg-server/template b/templates/xorg-server/template
index 49f922a1516..c9152ccf808 100644
--- a/templates/xorg-server/template
+++ b/templates/xorg-server/template
@@ -1,14 +1,14 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
 version=1.6.4
+revision=1
 distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--enable-xf86bigfont --enable-multibuffer --enable-record
- --enable-glx-tls --enable-xcalibrate --localstatedir=/var
- --disable-static --enable-config-dbus --sysconfdir=/etc/X11
- --enable-config-hal --enable-xcsecurity --enable-install-setuid
- --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
- --with-dri-driver-path=/usr/lib/dri"
+configure_args="--enable-record --with-dri-driver-path=/usr/lib/dri
+ --enable-glx-tls --localstatedir=/var --disable-static
+ --enable-config-dbus --sysconfdir=/etc/X11 --enable-config-hal
+ --enable-install-setuid --with-xkb-path=/usr/share/X11/xkb
+ --with-xkb-output=/var/lib/xkb"
 short_desc="Modular X11 server from modular X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9c736d4c0246a6f2214a2f2c1a6fa9e2bf860f7785bf469de575529851fc1145
@@ -18,6 +18,7 @@ long_desc="
 conf_files="/etc/dbus-1/system.d/xorg-server.conf"
 subpackages="devel"
 
+Add_dependency build dri2proto 2.1
 Add_dependency full glibc
 Add_dependency full openssl
 Add_dependency full dbus
@@ -68,5 +69,6 @@ pre_configure()
 
 post_install()
 {
+	find ${DESTDIR}/usr/lib/xorg/modules -type f -name \*.la -delete
 	rm -rf ${DESTDIR}/var/log
 }