diff --git a/srcpkgs/shadow/files/login.pam b/srcpkgs/shadow/files/login.pam
index 644c98d286f..bf61258b95b 100644
--- a/srcpkgs/shadow/files/login.pam
+++ b/srcpkgs/shadow/files/login.pam
@@ -1,4 +1,5 @@
-# /etc/pam.d/login service with cracklib.
+# login pam service with sha512 passwords, cracklib and
+# namespace support for tmpfs /tmp and /var/tmp.
 auth 		requisite	pam_nologin.so
 auth 		required	pam_securetty.so
 auth 		required	pam_unix.so
@@ -10,5 +11,6 @@ session 	required	pam_limits.so
 session 	optional	pam_mail.so 	dir=/var/mail standard
 session 	optional	pam_lastlog.so
 session 	required	pam_unix.so
+session		required	pam_namespace.so
 password	required	pam_cracklib.so	try_first_pass retry=3
 password	required	pam_unix.so 	sha512 shadow nullok try_first_pass use_authtok
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index 60e08217117..850dc762a7b 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,7 +1,7 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.1.4.2
-revision=1
+revision=2
 distfiles="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--libdir=/lib --enable-shared --disable-static
@@ -19,8 +19,10 @@ conf_files="/etc/pam.d/usermod /etc/pam.d/userdel /etc/pam.d/useradd
  /etc/pam.d/chgpasswd /etc/pam.d/chfn /etc/pam.d/chage /etc/defaults/useradd
  /etc/pam.d/other /etc/login.defs"
 
-Add_dependency full glibc
-Add_dependency full pam
+Add_dependency run glibc
+# Require this version for pam_namespace(8) setup.
+Add_dependency run pam		">=1.1.1_3"
+Add_dependency build pam-devel
 Add_dependency build gettext
 
 pre_build()