diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index b8cde74e83b..881ff9196e3 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,7 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
 version=1.11.4
+revision=1
 distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
@@ -27,7 +28,7 @@ Add_dependency run MesaLib
 Add_dependency build pkg-config
 Add_dependency build perl		">=0"
 Add_dependency build flex
-Add_dependency build glproto		">=1.4.14"
+Add_dependency build glproto		">=1.4.15"
 Add_dependency build xproto		">=7.0.22"
 Add_dependency build dri2proto		">=2.1"
 Add_dependency build xf86driproto
@@ -37,6 +38,8 @@ Add_dependency build compositeproto
 Add_dependency build scrnsaverproto
 Add_dependency build resourceproto
 Add_dependency build xineramaproto
+Add_dependency build xcmiscproto
+Add_dependency build bigreqsproto
 Add_dependency build libudev-devel
 Add_dependency build openssl-devel
 Add_dependency build libX11-devel
diff --git a/srcpkgs/xorg-server/xorg-server-devel.template b/srcpkgs/xorg-server/xorg-server-devel.template
index c9fab1ad25e..ef55269d256 100644
--- a/srcpkgs/xorg-server/xorg-server-devel.template
+++ b/srcpkgs/xorg-server/xorg-server-devel.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run libudev-devel
 Add_dependency run dri2proto		">=2.1"
 Add_dependency run glproto
@@ -32,8 +34,7 @@ Add_dependency run libXt-devel
 Add_dependency run libXpm-devel
 Add_dependency run libdrm-devel
 
-do_install()
-{
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/aclocal usr/share