diff --git a/srcpkgs/libXau/libXau-devel.template b/srcpkgs/libXau/libXau-devel.template
index 0aab0306c9..07299d3bc0 100644
--- a/srcpkgs/libXau/libXau-devel.template
+++ b/srcpkgs/libXau/libXau-devel.template
@@ -1,19 +1,16 @@
 # Template file for 'libXau-devel'.
 #
-depends="xproto libXau"
+noarch=yes
+depends="xproto ${sourcepkg}-${version}_${revision}"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/lib
 	mkdir -p ${DESTDIR}/usr/share/man
 	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/man3 ${DESTDIR}/usr/share/man
 	rm -rf ${SRCPKGDESTDIR}/usr/share
diff --git a/srcpkgs/libXau/template b/srcpkgs/libXau/template
index 6d473ff9da..d482206fac 100644
--- a/srcpkgs/libXau/template
+++ b/srcpkgs/libXau/template
@@ -1,15 +1,16 @@
 # Template build file for 'libXau'.
 pkgname=libXau
 version=1.0.5
-revision=3
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
+revision=4
+subpackages="$pkgname-devel"
 build_style=gnu-configure
+configure_args="--disable-static"
 makedepends="pkg-config xproto"
-short_desc="Authorization Protocol for X from X.org"
+short_desc="Authorization Protocol for X"
+homepage="$XORG_SITE"
+license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=a503b3e88d29fa9c45cce1b2d1af54106c2ce21491348c394e251a071d8108ee
 long_desc="
- LibXau is an authorization protocol for X from the modular
- X.org X11 project."
-
-subpackages="$pkgname-devel"
+ LibXau is an authorization protocol for X."