diff --git a/srcpkgs/apr-util/apr-util-devel.template b/srcpkgs/apr-util/apr-util-devel.template
index c316752a5b..9c1ac28d78 100644
--- a/srcpkgs/apr-util/apr-util-devel.template
+++ b/srcpkgs/apr-util/apr-util-devel.template
@@ -1,17 +1,16 @@
 # Template file for 'apr-util-devel'.
 #
-depends="zlib-devel openssl-devel apr-devel libuuid-devel expat-devel db-devel gdbm-devel sqlite-devel libldap-devel libmysqlclient-devel postgresql-libs-devel apr-util"
+noarch=yes
+depends="apr-devel expat-devel libldap-devel ${sourcepkg}>=${version}"
 short_desc="${short_desc} - development files"
 long_desc="
  ${long_desc}
  
  This packages contains files for development, static files, headers, etc."
 
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.{a,exp} ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/{include,bin} ${DESTDIR}/usr
+do_install() {
+	vmove usr/bin usr
+	vmove usr/include usr
+	vmove "usr/lib/*.exp" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 23838d2a45..04358350f8 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,17 +1,19 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.3.12
-distfiles="http://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
+revision=4
 build_style=gnu-configure
 configure_args="--with-pgsql --with-mysql --with-sqlite3 --with-ldap
 --with-berkeley-db --with-gdbm --with-apr=/usr --without-odbc
 --with-expat=/usr --without-oracle"
-revision=3
-makedepends="apr-devel db-devel expat-devel gdbm-devel libldap-devel libmysqlclient-devel libuuid-devel openssl-devel postgresql-libs-devel sqlite-devel zlib-devel"
+makedepends="apr-devel db-devel expat-devel gdbm-devel libldap-devel
+ libmysqlclient-devel libuuid-devel openssl-devel postgresql-libs-devel
+ sqlite-devel zlib-devel"
 short_desc="The Apache Portable Runtime Utility Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://apr.apache.org/"
 license="Apache-2.0"
+distfiles="http://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
 checksum=93976dc2f40d8622c4e9c355f419bb20f2c0dd843ee21a295a092d1c1b950d9c
 long_desc="
  APR is Apache's Portable Runtime Library, designed to be a support library
@@ -22,13 +24,10 @@ long_desc="
  access, xml parsing, and other useful functionality." 
 
 # XXX: add freetds and unixodbc modules.
-subpackages="$pkgname-db $pkgname-gdbm $pkgname-sqlite $pkgname-mysql"
-subpackages="${subpackages} $pkgname-pgsql $pkgname-ldap $pkgname-devel"
+subpackages="${pkgname}-db ${pkgname}-gdbm ${pkgname}-sqlite ${pkgname}-mysql
+ ${pkgname}-pgsql ${pkgname}-ldap ${pkgname}-devel"
 
-
-
-post_install()
-{
-	# Remove unused stuff.
-	rm -f ${DESTDIR}/usr/lib/apr-util-1/*.a
+post_install() {
+	# remove static libs
+	find ${DESTDIR} -type f -name \*.a -delete
 }