diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index c723c01d97e..26cbb0322e0 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,7 +1,7 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.1.5.1
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin --sbindir=/usr/sbin
  --libdir=/usr/lib --enable-shared --disable-static
@@ -26,7 +26,7 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 pre_build() {
-	# Don't install the groups cmd, we use the one from coreutils.
+	# Don't install groups(1), we use the one from coreutils.
 	sed -i 's/groups$(EXEEXT) //' src/Makefile
 	for f in $(find man -name Makefile); do
 		sed -i 's/groups\.1 / /' $f
@@ -61,7 +61,7 @@ post_install() {
 	rm \
 		$DESTDIR/usr/bin/{chsh,chfn,sg} \
 		$DESTDIR/usr/bin/{newgrp,login,su} \
-		$DESTDIR/usr/sbin/{logoutd,vipw,vigr}
+		$DESTDIR/usr/sbin/{nologin,logoutd,vipw,vigr}
 
 	# ...and their many man pages
 	find $DESTDIR/usr/share/man \
@@ -72,6 +72,7 @@ post_install() {
 		-name 'vipw.8'  -o \
 		-name 'vigr.8'  -o \
 		-name 'logoutd.8' -o \
+		-name 'nologin.8' -o \
 		-name 'newgrp.1' ')' \
 		-delete
 
@@ -97,7 +98,6 @@ shadow_package() {
 		/etc/login.defs"
 	depends="pam"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }