diff --git a/srcpkgs/acl/acl-devel.template b/srcpkgs/acl/acl-devel.template
index 063142ef983..943aea53818 100644
--- a/srcpkgs/acl/acl-devel.template
+++ b/srcpkgs/acl/acl-devel.template
@@ -1,17 +1,11 @@
 # Template file for 'acl-devel'.
 #
-depends="glibc-devel attr-devel acl"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
+depends="attr-devel acl>=${version}"
+short_desc="${short_desc} -- development files"
 
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/libacl.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man[235] ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.*a" usr/lib
+	vmove "usr/share/man/man[235]" usr/share/man
+	vmove usr/share/doc usr/share
 }
diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template
index 74d7aefdb29..97074120059 100644
--- a/srcpkgs/acl/template
+++ b/srcpkgs/acl/template
@@ -1,21 +1,22 @@
 # Template file for 'acl'
 pkgname=acl
 version=2.2.51
-distfiles="${NONGNU_SITE}/acl/acl-${version}.src.tar.gz"
+revision=4
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
-make_install_target="DIST_ROOT=$XBPS_DESTDIR/$pkgname-$version
- install install-lib install-dev"
-revision=3
+make_install_target="DIST_ROOT=${XBPS_DESTDIR}/${pkgname}-${version} install install-lib install-dev"
 makedepends="attr-devel"
+crossmakedepends="attr-devel"
 short_desc="Access Control List filesystem support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://savannah.nongnu.org/projects/acl"
 license="LGPL-2.1"
+distfiles="${NONGNU_SITE}/acl/acl-${version}.src.tar.gz"
 checksum=06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225
-long_desc="
- This package includes support for Access Control Lists support for supported
- filesystems."
 
 keep_libtool_archives=yes
 subpackages="acl-devel acl-progs"
+
+if [ "$XBPS_CROSS_TRIPLET" ]; then
+	unset makedepends
+fi