diff --git a/templates/shadow/files/passwd.pam b/templates/shadow/files/passwd.pam
index 68cde65d52f..8e6f1fed67c 100644
--- a/templates/shadow/files/passwd.pam
+++ b/templates/shadow/files/passwd.pam
@@ -1,6 +1,3 @@
 password	required	pam_cracklib.so	type=Linux retry=3 \
-						difok=5 diffignore=23 minlen=9 \
-						dcredit=1 ucredit=1 lcredit=1 \
-						ocredit=1 \
 						dictpath=/lib/cracklib/pw_dict
 password	required	pam_unix.so	sha512 shadow use_authtok
diff --git a/templates/shadow/template b/templates/shadow/template
index cb7f8020d0c..53ae6af4f7c 100644
--- a/templates/shadow/template
+++ b/templates/shadow/template
@@ -1,6 +1,7 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.1.3
+revision=1
 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
@@ -37,7 +38,7 @@ post_install()
 		install -m644 ${FILESDIR}/${f}.pam ${DESTDIR}/etc/pam.d/${f}
 	done
 	for f in chpasswd chgpasswd groupadd groupdel groupmems \
-		 groupmod newusers useradd userdel usermod; do
+		 groupmod newusers useradd userdel usermod chsh chfn; do
 		install -m644 $DESTDIR/etc/pam.d/chage $DESTDIR/etc/pam.d/${f}
 	done
 	install -m644 ${FILESDIR}/login.defs ${DESTDIR}/etc