diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index c16cb119b3d..285ff8ce3f6 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -19,24 +19,63 @@ conf_files="/etc/dbus-1/system.d/xorg-server.conf"
 subpackages="$pkgname-devel"
 
 Add_dependency run glibc
+Add_dependency run libdmx
+Add_dependency run libXext
+Add_dependency run libX11
+Add_dependency run libpciaccess
+Add_dependency run libXfont
+Add_dependency run libXau
+Add_dependency run pixman
+Add_dependency run dbus-libs
+Add_dependency run libXdmcp
+Add_dependency run openssl
+Add_dependency run libXmu
+Add_dependency run libXrender
+Add_dependency run libXfixes
+Add_dependency run libXi
+Add_dependency run libXaw
+Add_dependency run libXt
+Add_dependency run libSM
+Add_dependency run libICE
+Add_dependency run libXpm
+Add_dependency run libdrm
 Add_dependency build dri2proto	">=2.1"
 Add_dependency build xf86driproto
+Add_dependency build randrproto
+Add_dependency build videoproto
+Add_dependency build compositeproto
+Add_dependency build scrnsaverproto
+Add_dependency build resourceproto
+Add_dependency build xineramaproto
 Add_dependency build perl
 Add_dependency build pkg-config
 Add_dependency build flex
+Add_dependency build libdmx-devel
+Add_dependency build libXext-devel
+Add_dependency build libX11-devel
+Add_dependency build glibc-devel
+Add_dependency build libpciaccess-devel
+Add_dependency build libXfont-devel
+Add_dependency build libXau-devel
+Add_dependency build pixman-devel
+Add_dependency build dbus-devel
+Add_dependency build libXdmcp-devel
+Add_dependency build openssl-devel
+Add_dependency build libXmu-devel
+Add_dependency build libXrender-devel
+Add_dependency build libXfixes-devel
+Add_dependency build libXi-devel
+Add_dependency build libXaw-devel
+Add_dependency build libXt-devel
+Add_dependency build libSM-devel
+Add_dependency build libICE-devel
+Add_dependency build libXpm-devel
+Add_dependency build libdrm-devel
 Add_dependency full hal
 Add_dependency full libxkbui
 Add_dependency full libxkbfile
 Add_dependency full xkeyboard-config
 
-_deps="openssl dbus MesaLib libpciaccess pixman libdmx libICE libSM libX11"
-_deps="${_deps} libXaw libXdmcp libXext libXfixes libXfont libXi libXmu"
-_deps="${_deps} libXpm libXrender libXt libXau"
-for _dep_ in ${_deps}; do
-	Add_dependency run	${_dep_}
-	Add_dependency build	${_dep_}-devel
-done
-
 pre_configure()
 {
 	# Fix dbus config path
diff --git a/srcpkgs/xorg-server/xorg-server-devel.template b/srcpkgs/xorg-server/xorg-server-devel.template
index 9c5e96ba4eb..514202c7080 100644
--- a/srcpkgs/xorg-server/xorg-server-devel.template
+++ b/srcpkgs/xorg-server/xorg-server-devel.template
@@ -5,20 +5,38 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
 Add_dependency run dri2proto  ">=2.1"
 Add_dependency run xf86driproto
-Add_dependency run perl
-Add_dependency run pkg-config
-Add_dependency run flex
-Add_dependency run hal
-
-_deps="openssl dbus libpciaccess pixman libdmx libICE libSM libX11 libXau"
-_deps="${_deps} libXaw libXdmcp libXext libXfixes libXfont libXi libXmu"
-_deps="${_deps} libXpm libXrender libXt"
-for _dep_ in ${_deps}; do
-        Add_dependency run      ${_dep_}-devel
-done
-
+Add_dependency run randrproto
+Add_dependency run videoproto
+Add_dependency run compositeproto
+Add_dependency run scrnsaverproto
+Add_dependency run resourceproto
+Add_dependency run xineramaproto
+Add_dependency run libdmx-devel
+Add_dependency run libXext-devel
+Add_dependency run libX11-devel
+Add_dependency run glibc-devel
+Add_dependency run libpciaccess-devel
+Add_dependency run libXfont-devel
+Add_dependency run libXau-devel
+Add_dependency run pixman-devel
+Add_dependency run dbus-devel
+Add_dependency run libXdmcp-devel
+Add_dependency run openssl-devel
+Add_dependency run libXmu-devel
+Add_dependency run libXrender-devel
+Add_dependency run libXfixes-devel
+Add_dependency run libXi-devel
+Add_dependency run libXaw-devel
+Add_dependency run libXt-devel
+Add_dependency run libSM-devel
+Add_dependency run libICE-devel
+Add_dependency run libXpm-devel
+Add_dependency run libdrm-devel
 Add_dependency run xorg-server
 
 do_install()