diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index c2505fe1a5..27bdb37296 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -4,24 +4,24 @@ version=1.12.4
 revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
---enable-xnest --enable-xephyr --enable-composite --enable-xvfb
---enable-glx-tls --disable-static --disable-config-hal
---disable-config-dbus --enable-config-udev --sysconfdir=/etc/X11
---with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
---with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto
---disable-dmx --disable-xfree86-utils --enable-dga
---enable-install-setuid"
+ --enable-xnest --enable-xephyr --enable-composite --enable-xvfb
+ --enable-glx-tls --disable-static --disable-config-hal
+ --disable-config-dbus --enable-config-udev --sysconfdir=/etc/X11
+ --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
+ --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 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"
+ 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>"
diff --git a/srcpkgs/xorg-server/xorg-server-devel.template b/srcpkgs/xorg-server/xorg-server-devel.template
index bb608548fa..bfa3c53ff4 100644
--- a/srcpkgs/xorg-server/xorg-server-devel.template
+++ b/srcpkgs/xorg-server/xorg-server-devel.template
@@ -1,7 +1,13 @@
 # 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>=2.4.34"
+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>=2.4.34"
+
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}