diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index 25ded39ae31..ea898298bd0 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,24 +1,21 @@
 # Template file for 'pam'
 pkgname=pam
-version=1.1.6
-revision=7
+version=1.1.8
+revision=1
 wrksrc="Linux-PAM-$version"
 build_style=gnu-configure
-configure_args="--libdir=/usr/lib --sbindir=/usr/sbin
- --docdir=/usr/share/doc/pam --disable-nis"
+configure_args="--libdir=/usr/lib --sbindir=/usr/sbin --docdir=/usr/share/doc/pam --disable-nis"
 hostmakedepends="flex"
-makedepends="cracklib-devel db-devel>=5.3"
+makedepends="libfl-devel cracklib-devel db-devel>=5.3"
 short_desc="A flexible mechanism for authenticating users"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/libs/pam/"
 license="GPL-2"
-#distfiles="${KERNEL_SITE}/libs/pam/library/Linux-PAM-$version.tar.bz2"
-distfiles="https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$version.tar.bz2"
-checksum=bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2
+distfiles="https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-${version}.tar.bz2"
+checksum=c4b1f23a236d169e2496fea20721578d864ba00f7242d2b41d81050ac87a1e55
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake gettext-devel pkg-config libtool"
-	makedepends+=" libfl-devel"
 	pre_configure() {
 		autoreconf -fi
 	}
@@ -37,12 +34,13 @@ post_install() {
 }
 
 pam-devel_package() {
-	depends="pam-libs>=${version}"
+	depends="pam-libs>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/share/man/man3
 		vmove usr/share/doc
+		vmove "usr/lib/*.so"
 	}
 }
 
@@ -50,7 +48,7 @@ pam-libs_package() {
 	short_desc+=" - runtime libraries"
 	replaces="pam<1.1.6_3"
 	pkg_install() {
-		vmove "usr/lib/*.so*"
+		vmove "usr/lib/*.so.*"
 	}
 }
 
@@ -71,6 +69,9 @@ pam_package() {
 		/etc/security/namespace.conf
 		/etc/security/pam_env.conf
 		/etc/security/time.conf"
+	makedirs="
+		/etc/security/limits.d 0755 root root
+		/etc/security/namespace.d 0755 root root"
 	depends="cracklib"
 	pkg_install() {
 		vmove all