diff --git a/srcpkgs/libcap-pam b/srcpkgs/libcap-pam
deleted file mode 120000
index 4085af64013..00000000000
--- a/srcpkgs/libcap-pam
+++ /dev/null
@@ -1 +0,0 @@
-libcap
\ No newline at end of file
diff --git a/srcpkgs/libcap-pam/template b/srcpkgs/libcap-pam/template
new file mode 100644
index 00000000000..37b4d85516a
--- /dev/null
+++ b/srcpkgs/libcap-pam/template
@@ -0,0 +1,30 @@
+# Template file for 'libcap-pam'
+pkgname=libcap-pam
+version=2.24
+revision=1
+wrksrc="libcap-${version}"
+hostmakedepends="gperf perl pam-devel"
+makedepends="pam-devel attr-devel"
+conf_files="/etc/security/capability.conf"
+short_desc="POSIX.1e capabilities suite - PAM module"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://sites.google.com/site/fullycapable/"
+license="GPL-2"
+distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/libcap-$version.tar.xz"
+checksum=cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65
+
+do_build() {
+	make CC="$CC" BUILD_CC=cc
+}
+
+do_install() {
+	_destdir=${wrksrc}/temp_install
+
+	make DESTDIR=${_destdir} MANDIR=${_destdir}/usr/share/man \
+		SBINDIR=${_destdir}/usr/sbin LIBDIR=${_destdir}/usr/lib \
+		RAISE_SETFCAP=no PKGCONFIGDIR=${_destdir}/usr/lib/pkgconfig install
+
+	vinstall pam_cap/capability.conf 644 etc/security
+	vmkdir usr/lib
+	mv ${_destdir}/usr/lib/security ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index e7f451aba81..4f78eeb661e 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -2,8 +2,8 @@
 pkgname=libcap
 version=2.24
 revision=1
-hostmakedepends="gperf perl pam-devel"
-makedepends="pam-devel attr-devel"
+hostmakedepends="gperf perl"
+makedepends="attr-devel"
 short_desc="POSIX.1e capabilities suite"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://sites.google.com/site/fullycapable/"
@@ -20,7 +20,6 @@ do_install() {
 		SBINDIR=${DESTDIR}/usr/sbin LIBDIR=${DESTDIR}/usr/lib \
 		RAISE_SETFCAP=no PKGCONFIGDIR=${DESTDIR}/usr/lib/pkgconfig install
 
-	vinstall pam_cap/capability.conf 644 etc/security
 	chmod 755 ${DESTDIR}/usr/lib/libcap.so.*
 }
 
@@ -36,15 +35,6 @@ libcap-devel_package() {
 	}
 }
 
-libcap-pam_package() {
-	conf_files="/etc/security/capability.conf"
-	short_desc+=" - PAM module"
-	pkg_install() {
-		vmove usr/lib/security
-		vmove etc
-	}
-}
-
 libcap-progs_package() {
 	short_desc+=" - utilities"
 	pkg_install() {