diff --git a/srcpkgs/acl/acl-devel.template b/srcpkgs/acl/acl-devel.template
index 943aea5381..840e86500b 100644
--- a/srcpkgs/acl/acl-devel.template
+++ b/srcpkgs/acl/acl-devel.template
@@ -7,5 +7,5 @@ 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
+	rm -rf ${SRCPKGDESTDIR}/usr/share/doc
 }
diff --git a/srcpkgs/acl/acl-progs.template b/srcpkgs/acl/acl-progs.template
index 4ccc37def9..5bb3bcc733 100644
--- a/srcpkgs/acl/acl-progs.template
+++ b/srcpkgs/acl/acl-progs.template
@@ -1,14 +1,8 @@
 # Template file for 'acl-progs'.
 #
-short_desc="${short_desc} (utilities)"
-long_desc="${long_desc}
+short_desc="${short_desc} -- utilities"
 
- This package contains binary utilities provided by the acl package."
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1 ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/share/locale ${DESTDIR}/usr/share
+do_install() {
+	vmove usr/bin usr
+	vmove usr/share usr
 }
diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template
index 9707412005..817b853826 100644
--- a/srcpkgs/acl/template
+++ b/srcpkgs/acl/template
@@ -1,7 +1,8 @@
 # Template file for 'acl'
 pkgname=acl
 version=2.2.51
-revision=4
+revision=5
+subpackages="acl-devel acl-progs"
 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"
@@ -14,9 +15,6 @@ license="LGPL-2.1"
 distfiles="${NONGNU_SITE}/acl/acl-${version}.src.tar.gz"
 checksum=06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225
 
-keep_libtool_archives=yes
-subpackages="acl-devel acl-progs"
-
-if [ "$XBPS_CROSS_TRIPLET" ]; then
+if [ -n "$XBPS_CROSS_TRIPLET" ]; then
 	unset makedepends
 fi