diff --git a/srcpkgs/libcap/libcap-pam.template b/srcpkgs/libcap/libcap-pam.template
index 99eac33c412..bc613daa425 100644
--- a/srcpkgs/libcap/libcap-pam.template
+++ b/srcpkgs/libcap/libcap-pam.template
@@ -1,16 +1,12 @@
 # Template file for 'libcap-pam'.
 #
-depends="attr pam"
+conf_files="/etc/security/capability.conf"
 short_desc="${short_desc} (PAM module)"
 long_desc="${long_desc}
 
  This package contains a PAM module provided by the libcap package."
 
-conf_files="/etc/security/capability.conf"
-
-
-do_install()
-{
-	vmove lib/security lib
+do_install() {
+	vmove lib/security usr/lib
 	vmove etc
 }
diff --git a/srcpkgs/libcap/libcap-progs.template b/srcpkgs/libcap/libcap-progs.template
index 55f7a280e31..23e7cbfc0c6 100644
--- a/srcpkgs/libcap/libcap-progs.template
+++ b/srcpkgs/libcap/libcap-progs.template
@@ -5,9 +5,7 @@ long_desc="${long_desc}
 
  This package contains binary utilities provided by the libcap package."
 
-
-do_install()
-{
-	vmove sbin
+do_install() {
+	vmove "sbin/*" usr/sbin
 	vmove usr/share usr
 }
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 48084fe72b4..c3cbb75cca0 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,21 +1,20 @@
 # Template file for 'libcap'
 pkgname=libcap
 version=2.22
-revision=4
-distfiles="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz"
-#distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/$pkgname-$version.tar.bz2"
+revision=5
+subpackages="$pkgname-devel $pkgname-pam $pkgname-progs"
 makedepends="perl pam-devel attr-devel"
 short_desc="POSIX.1e capabilities library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://sites.google.com/site/fullycapable/"
 license="GPL-2"
+distfiles="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz"
+#distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/$pkgname-$version.tar.bz2"
 checksum=e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f
 long_desc="
  libcap is a library for getting and setting POSIX.1e (formerly POSIX 6)
  draft 15 capabilities."
 
-subpackages="$pkgname-devel $pkgname-pam $pkgname-progs"
-
 do_build() {
 	sed -i -e "s|LIBDIR=\$(FAKEROOT)\$(lib_prefix)\/lib|LIBDIR=\$(FAKEROOT)/\$(lib)|g" \
 		Make.Rules