diff --git a/templates/shadow/files/shadow.cron-daily b/templates/shadow/files/shadow.cron-daily
new file mode 100755
index 0000000000..1931a793ee
--- /dev/null
+++ b/templates/shadow/files/shadow.cron-daily
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Verify integrity of password and group files
+/usr/sbin/pwck -r
+/usr/sbin/grpck -r
+
diff --git a/templates/shadow/template b/templates/shadow/template
index 146db82ca0..7ce5852e18 100644
--- a/templates/shadow/template
+++ b/templates/shadow/template
@@ -1,6 +1,7 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.1.2.2
+revision=1
 patch_files="$pkgname-enable-pam.diff"
 distfiles="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -37,4 +38,8 @@ post_install()
 		 groupmod newusers useradd userdel usermod other; do
 		install -m644 $DESTDIR/etc/pam.d/chage $DESTDIR/etc/pam.d/${f}
 	done
+
+	# Install the cron daily job.
+	install -D -m755 ${FILESDIR}/shadow.cron-daily \
+		${DESTDIR}/etc/cron.daily/shadow
 }