diff --git a/srcpkgs/libX11/depends b/srcpkgs/libX11/depends
index 69d34d38dfe..4704e445484 100644
--- a/srcpkgs/libX11/depends
+++ b/srcpkgs/libX11/depends
@@ -1,2 +1,2 @@
 abi_depends=">=1.2"
-api_depends="${abi_depends}"
+api_depends=">=1.4.4_1" # fixed rundeps in -devel subpkg.
diff --git a/srcpkgs/libX11/libX11-devel.template b/srcpkgs/libX11/libX11-devel.template
index 0d0226763bf..e53a0d5adc1 100644
--- a/srcpkgs/libX11/libX11-devel.template
+++ b/srcpkgs/libX11/libX11-devel.template
@@ -1,32 +1,20 @@
 # Template file for 'libX11-devel'.
 #
+revision=1
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
 Add_dependency run xproto
-Add_dependency run xextproto
-Add_dependency run xtrans
-Add_dependency run xcmiscproto
 Add_dependency run kbproto
-Add_dependency run bigreqsproto
-Add_dependency run inputproto
-Add_dependency run xf86bigfontproto
 Add_dependency run libxcb-devel
-Add_dependency run libXcursor-devel
 Add_dependency run libX11
 
-do_install()
-{
-	install -d ${DESTDIR}/usr/{lib,share}
-	install -d ${DESTDIR}/usr/lib/X11/locale/common
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/lib/X11/locale/common/*.a \
-		${DESTDIR}/usr/lib/X11/locale/common
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/man usr/share
+	vmove "usr/lib/X11/locale/common/*.a" usr/lib/X11/locale/common
 }
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 5fcbd61d31d..785dc18ecf3 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -5,7 +5,7 @@ distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
 --disable-secure-rpc --enable-loadable-i18n"
-revision=1
+revision=2
 short_desc="Base X libraries from modular Xorg X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org/"
@@ -29,7 +29,6 @@ Add_dependency build inputproto
 Add_dependency build xf86bigfontproto
 Add_dependency build libxcb-devel
 
-post_install()
-{
+post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }