diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 6f1ab44d43..fcad17d07a 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.12.1.902
+revision=1
 distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
@@ -11,8 +12,11 @@ configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
 --with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto
 --disable-dmx --disable-xfree86-utils --enable-dga
 --enable-install-setuid"
+conf_files="/etc/udev/rules.d/75-x11-input.rules"
+subpackages="$pkgname-devel"
+# Not a direct dependency, but it's required for DRI to work.
 depends="MesaLib"
-makedepends="pkg-config perl>=0 flex inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22 dri2proto>=2.1 xf86driproto randrproto videoproto compositeproto scrnsaverproto resourceproto xineramaproto xcmiscproto bigreqsproto libudev-devel openssl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel libxkbfile-devel libXxf86dga-devel pixman-devel MesaLib-devel"
+makedepends="pkg-config perl>=0 flex inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22 dri2proto>=2.1 xf86driproto randrproto videoproto compositeproto scrnsaverproto resourceproto xineramaproto xcmiscproto bigreqsproto libudev-devel>=183 openssl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel libxkbfile-devel libXxf86dga-devel pixman-devel MesaLib-devel"
 fulldepends="xkeyboard-config"
 short_desc="X11 server from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -22,13 +26,6 @@ checksum=052efb01c47348b4138c89ad5654be022a4d952acc6129b2ad2659bc1ff4d509
 long_desc="
  The X11 server from the modularized source tree of X.org."
 
-conf_files="/etc/udev/rules.d/75-x11-input.rules"
-subpackages="$pkgname-devel"
-
-# Not a direct dependency, but it's required for DRI to work.
-
-
-
 post_install() {
 	vinstall ${FILESDIR}/x11-input.rules 644 \
 		etc/udev/rules.d 75-x11-input.rules
diff --git a/srcpkgs/xorg-server/xorg-server-devel.template b/srcpkgs/xorg-server/xorg-server-devel.template
index 37143dd5de..edf9883e0f 100644
--- a/srcpkgs/xorg-server/xorg-server-devel.template
+++ b/srcpkgs/xorg-server/xorg-server-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'xorg-server-devel'.
 #
+noarch=yes
 depends="libudev-devel dri2proto>=2.1 glproto xf86driproto randrproto videoproto compositeproto scrnsaverproto resourceproto xineramaproto libdmx-devel libXext-devel libX11-devel libpciaccess-devel libXfont-devel libXau-devel pixman-devel libXdmcp-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel libXaw-devel libXt-devel libXpm-devel libdrm-devel"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-noarch=yes
-
 do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
diff --git a/srcpkgs/xorg-server/xorg-server.rshlibs b/srcpkgs/xorg-server/xorg-server.rshlibs
index 569dd188dd..6d92937431 100644
--- a/srcpkgs/xorg-server/xorg-server.rshlibs
+++ b/srcpkgs/xorg-server/xorg-server.rshlibs
@@ -5,7 +5,6 @@ libpciaccess.so.0
 libdl.so.2
 libdrm.so.2
 libpixman-1.so.0
-libudev.so.0
 libcrypto.so.1
 libpthread.so.0
 libXfont.so.1
@@ -13,3 +12,4 @@ libXau.so.6
 libXdmcp.so.6
 libXext.so.6
 libX11.so.6
+libudev.so.1