diff -Naur shadow-4.2.1/man/cs/Makefile.am shadow-4.2.1-lunar/man/cs/Makefile.am
--- shadow-4.2.1/man/cs/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/cs/Makefile.am	2016-01-23 11:26:19.635979377 +0100
@@ -13,14 +13,10 @@
 	man8/grpck.8 \
 	man5/gshadow.5 \
 	man8/lastlog.8 \
-	man8/nologin.8 \
 	man5/passwd.5 \
-	man5/shadow.5 \
-	man1/su.1 \
-	man8/vipw.8
+	man5/shadow.5
 
 EXTRA_DIST = $(man_MANS) \
 	man1/id.1 \
-	man8/groupmems.8 \
-	man8/logoutd.8
+	man8/groupmems.8
 
diff -Naur shadow-4.2.1/man/da/Makefile.am shadow-4.2.1-lunar/man/da/Makefile.am
--- shadow-4.2.1/man/da/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/da/Makefile.am	2016-01-23 11:30:23.425987898 +0100
@@ -3,16 +3,11 @@
 
 # 2012.01.28 - activate manpages with more than 50% translated messages
 man_MANS = \
-	man1/chfn.1 \
 	man8/groupdel.8 \
 	man1/groups.1 \
 	man5/gshadow.5 \
-	man8/logoutd.8 \
 	man1/newgrp.1 \
-	man8/nologin.8 \
-	man1/sg.1 \
-	man8/vigr.8 \
-	man8/vipw.8
+	man1/sg.1
 
 man_nopam = 
 
diff -Naur shadow-4.2.1/man/de/Makefile.am shadow-4.2.1-lunar/man/de/Makefile.am
--- shadow-4.2.1/man/de/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/de/Makefile.am	2016-01-23 11:30:02.612653837 +0100
@@ -3,10 +3,8 @@
 
 man_MANS = \
 	man1/chage.1 \
-	man1/chfn.1 \
 	man8/chgpasswd.8 \
 	man8/chpasswd.8 \
-	man1/chsh.1 \
 	man1/expiry.1 \
 	man5/faillog.5 \
 	man8/faillog.8 \
@@ -22,12 +20,9 @@
 	man8/grpunconv.8 \
 	man5/gshadow.5 \
 	man8/lastlog.8 \
-	man1/login.1 \
 	man5/login.defs.5 \
-	man8/logoutd.8 \
 	man1/newgrp.1 \
 	man8/newusers.8 \
-	man8/nologin.8 \
 	man1/passwd.1 \
 	man5/passwd.5 \
 	man8/pwck.8 \
@@ -36,13 +31,10 @@
 	man1/sg.1 \
 	man3/shadow.3 \
 	man5/shadow.5 \
-	man1/su.1 \
 	man5/suauth.5 \
 	man8/useradd.8 \
 	man8/userdel.8 \
-	man8/usermod.8 \
-	man8/vigr.8 \
-	man8/vipw.8
+	man8/usermod.8
 
 man_nopam = \
 	man5/limits.5 \
diff -Naur shadow-4.2.1/man/fi/Makefile.am shadow-4.2.1-lunar/man/fi/Makefile.am
--- shadow-4.2.1/man/fi/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/fi/Makefile.am	2016-01-23 11:25:57.912645285 +0100
@@ -1,10 +1,8 @@
 
 mandir = @mandir@/fi
 
-man_MANS = \
-	man1/chfn.1 \
-	man1/chsh.1 \
-	man1/su.1
+man_MANS =
+
 
 # Outdated manpages
 #	passwd.1 (https://bugs.launchpad.net/ubuntu/+bug/384024)
diff -Naur shadow-4.2.1/man/fr/Makefile.am shadow-4.2.1-lunar/man/fr/Makefile.am
--- shadow-4.2.1/man/fr/Makefile.am	2014-03-01 19:59:51.000000000 +0100
+++ shadow-4.2.1-lunar/man/fr/Makefile.am	2016-01-23 11:29:28.485985978 +0100
@@ -3,10 +3,8 @@
 
 man_MANS = \
 	man1/chage.1 \
-	man1/chfn.1 \
 	man8/chgpasswd.8 \
 	man8/chpasswd.8 \
-	man1/chsh.1 \
 	man1/expiry.1 \
 	man5/faillog.5 \
 	man8/faillog.8 \
@@ -22,12 +20,9 @@
 	man8/grpunconv.8 \
 	man5/gshadow.5 \
 	man8/lastlog.8 \
-	man1/login.1 \
 	man5/login.defs.5 \
-	man8/logoutd.8 \
 	man1/newgrp.1 \
 	man8/newusers.8 \
-	man8/nologin.8 \
 	man1/passwd.1 \
 	man5/passwd.5 \
 	man8/pwck.8 \
@@ -36,13 +31,10 @@
 	man1/sg.1 \
 	man3/shadow.3 \
 	man5/shadow.5 \
-	man1/su.1 \
 	man5/suauth.5 \
 	man8/useradd.8 \
 	man8/userdel.8 \
-	man8/usermod.8 \
-	man8/vigr.8 \
-	man8/vipw.8
+	man8/usermod.8
 
 man_nopam = \
 	man5/limits.5 \
diff -Naur shadow-4.2.1/man/hu/Makefile.am shadow-4.2.1-lunar/man/hu/Makefile.am
--- shadow-4.2.1/man/hu/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/hu/Makefile.am	2016-01-23 11:29:07.999318596 +0100
@@ -2,16 +2,13 @@
 mandir = @mandir@/hu
 
 man_MANS = \
-	man1/chsh.1 \
 	man1/gpasswd.1 \
 	man1/groups.1 \
 	man8/lastlog.8 \
-	man1/login.1 \
 	man1/newgrp.1 \
 	man1/passwd.1 \
 	man5/passwd.5 \
-	man1/sg.1 \
-	man1/su.1
+	man1/sg.1
 
 EXTRA_DIST = $(man_MANS)
  
diff -Naur shadow-4.2.1/man/id/Makefile.am shadow-4.2.1-lunar/man/id/Makefile.am
--- shadow-4.2.1/man/id/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/id/Makefile.am	2016-01-23 11:28:54.399318120 +0100
@@ -2,8 +2,6 @@
 mandir = @mandir@/id
 
 man_MANS = \
-	man1/chsh.1 \
-	man1/login.1 \
 	man8/useradd.8
 
 EXTRA_DIST = $(man_MANS)
diff -Naur shadow-4.2.1/man/it/Makefile.am shadow-4.2.1-lunar/man/it/Makefile.am
--- shadow-4.2.1/man/it/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/it/Makefile.am	2016-01-23 11:25:43.175978104 +0100
@@ -3,10 +3,8 @@
 
 man_MANS = \
 	man1/chage.1 \
-	man1/chfn.1 \
 	man8/chgpasswd.8 \
 	man8/chpasswd.8 \
-	man1/chsh.1 \
 	man1/expiry.1 \
 	man5/faillog.5 \
 	man8/faillog.8 \
@@ -22,12 +20,9 @@
 	man8/grpunconv.8 \
 	man5/gshadow.5 \
 	man8/lastlog.8 \
-	man1/login.1 \
 	man5/login.defs.5 \
-	man8/logoutd.8 \
 	man1/newgrp.1 \
 	man8/newusers.8 \
-	man8/nologin.8 \
 	man1/passwd.1 \
 	man5/passwd.5 \
 	man8/pwck.8 \
@@ -36,13 +31,10 @@
 	man1/sg.1 \
 	man3/shadow.3 \
 	man5/shadow.5 \
-	man1/su.1 \
 	man5/suauth.5 \
 	man8/useradd.8 \
 	man8/userdel.8 \
-	man8/usermod.8 \
-	man8/vigr.8 \
-	man8/vipw.8
+	man8/usermod.8
 
 man_nopam = \
 	man5/limits.5 \
diff -Naur shadow-4.2.1/man/ja/Makefile.am shadow-4.2.1-lunar/man/ja/Makefile.am
--- shadow-4.2.1/man/ja/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/ja/Makefile.am	2016-01-23 11:28:43.569317741 +0100
@@ -3,9 +3,7 @@
 
 man_MANS = \
 	man1/chage.1 \
-	man1/chfn.1 \
 	man8/chpasswd.8 \
-	man1/chsh.1 \
 	man1/expiry.1 \
 	man5/faillog.5 \
 	man8/faillog.8 \
@@ -18,9 +16,7 @@
 	man8/grpconv.8 \
 	man8/grpunconv.8 \
 	man8/lastlog.8 \
-	man1/login.1 \
 	man5/login.defs.5 \
-	man8/logoutd.8 \
 	man1/newgrp.1 \
 	man8/newusers.8 \
 	man1/passwd.1 \
@@ -30,13 +26,10 @@
 	man8/pwunconv.8 \
 	man1/sg.1 \
 	man5/shadow.5 \
-	man1/su.1 \
 	man5/suauth.5 \
 	man8/useradd.8 \
 	man8/userdel.8 \
-	man8/usermod.8 \
-	man8/vigr.8 \
-	man8/vipw.8
+	man8/usermod.8
 
 man_nopam = \
 	man5/limits.5 \
diff -Naur shadow-4.2.1/man/ko/Makefile.am shadow-4.2.1-lunar/man/ko/Makefile.am
--- shadow-4.2.1/man/ko/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/ko/Makefile.am	2016-01-23 11:28:12.699316663 +0100
@@ -2,14 +2,9 @@
 mandir = @mandir@/ko
 
 man_MANS = \
-	man1/chfn.1 \
-	man1/chsh.1 \
 	man1/groups.1 \
-	man1/login.1 \
-	man5/passwd.5 \
-	man1/su.1 \
-	man8/vigr.8 \
-	man8/vipw.8
+	man5/passwd.5
+
 # newgrp.1 must be updated
 #	newgrp.1
 
diff -Naur shadow-4.2.1/man/Makefile.am shadow-4.2.1-lunar/man/Makefile.am
--- shadow-4.2.1/man/Makefile.am	2014-03-13 06:52:55.000000000 +0100
+++ shadow-4.2.1-lunar/man/Makefile.am	2016-01-23 11:20:23.662633603 +0100
@@ -8,10 +8,8 @@
 
 man_MANS = \
 	man1/chage.1 \
-	man1/chfn.1 \
 	man8/chgpasswd.8 \
 	man8/chpasswd.8 \
-	man1/chsh.1 \
 	man1/expiry.1 \
 	man5/faillog.5 \
 	man8/faillog.8 \
@@ -27,12 +25,9 @@
 	man8/grpunconv.8 \
 	man5/gshadow.5 \
 	man8/lastlog.8 \
-	man1/login.1 \
 	man5/login.defs.5 \
-	man8/logoutd.8 \
 	man1/newgrp.1 \
 	man8/newusers.8 \
-	man8/nologin.8 \
 	man1/passwd.1 \
 	man5/passwd.5 \
 	man8/pwck.8 \
@@ -41,13 +36,10 @@
 	man1/sg.1 \
 	man3/shadow.3 \
 	man5/shadow.5 \
-	man1/su.1 \
 	man5/suauth.5 \
 	man8/useradd.8 \
 	man8/userdel.8 \
-	man8/usermod.8 \
-	man8/vigr.8 \
-	man8/vipw.8
+	man8/usermod.8
 
 man_nopam = \
 	man5/limits.5 \
@@ -70,10 +62,8 @@
 
 man_XMANS = \
 	chage.1.xml \
-	chfn.1.xml \
 	chgpasswd.8.xml \
 	chpasswd.8.xml \
-	chsh.1.xml \
 	expiry.1.xml \
 	faillog.5.xml \
 	faillog.8.xml \
@@ -87,15 +77,12 @@
 	gshadow.5.xml \
 	lastlog.8.xml \
 	limits.5.xml \
-	login.1.xml \
 	login.access.5.xml \
 	login.defs.5.xml \
-	logoutd.8.xml \
 	newgidmap.1.xml \
 	newgrp.1.xml \
 	newuidmap.1.xml \
 	newusers.8.xml \
-	nologin.8.xml \
 	passwd.1.xml \
 	passwd.5.xml \
 	porttime.5.xml \
@@ -104,14 +91,12 @@
 	shadow.3.xml \
 	shadow.5.xml \
 	sg.1.xml \
-	su.1.xml \
 	suauth.5.xml \
 	subgid.5.xml \
 	subuid.5.xml \
 	useradd.8.xml \
 	userdel.8.xml \
-	usermod.8.xml \
-	vipw.8.xml
+	usermod.8.xml
 
 login_defs_v = \
 	CHFN_AUTH.xml \
diff -Naur shadow-4.2.1/man/pl/Makefile.am shadow-4.2.1-lunar/man/pl/Makefile.am
--- shadow-4.2.1/man/pl/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/pl/Makefile.am	2016-01-23 11:27:57.349316126 +0100
@@ -3,8 +3,6 @@
 
 # 2012.01.28 - activate manpages with more than 50% translated messages
 man_MANS = \
-	man1/chage.1 \
-	man1/chsh.1 \
 	man1/expiry.1 \
 	man5/faillog.5 \
 	man8/faillog.8 \
@@ -16,14 +14,11 @@
 	man1/groups.1 \
 	man8/grpck.8 \
 	man8/lastlog.8 \
-	man8/logoutd.8 \
 	man1/newgrp.1 \
 	man1/sg.1 \
 	man3/shadow.3 \
 	man8/userdel.8 \
-	man8/usermod.8 \
-	man8/vigr.8 \
-	man8/vipw.8
+	man8/usermod.8
 
 man_nopam = \
 	man5/porttime.5
diff -Naur shadow-4.2.1/man/ru/Makefile.am shadow-4.2.1-lunar/man/ru/Makefile.am
--- shadow-4.2.1/man/ru/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/ru/Makefile.am	2016-01-23 11:27:24.555981646 +0100
@@ -2,11 +2,8 @@
 mandir = @mandir@/ru
 
 man_MANS = \
-	man1/chage.1 \
-	man1/chfn.1 \
 	man8/chgpasswd.8 \
 	man8/chpasswd.8 \
-	man1/chsh.1 \
 	man1/expiry.1 \
 	man5/faillog.5 \
 	man8/faillog.8 \
@@ -22,12 +19,9 @@
 	man8/grpunconv.8 \
 	man5/gshadow.5 \
 	man8/lastlog.8 \
-	man1/login.1 \
 	man5/login.defs.5 \
-	man8/logoutd.8 \
 	man1/newgrp.1 \
 	man8/newusers.8 \
-	man8/nologin.8 \
 	man1/passwd.1 \
 	man5/passwd.5 \
 	man8/pwck.8 \
@@ -36,13 +30,10 @@
 	man1/sg.1 \
 	man3/shadow.3 \
 	man5/shadow.5 \
-	man1/su.1 \
 	man5/suauth.5 \
 	man8/useradd.8 \
 	man8/userdel.8 \
-	man8/usermod.8 \
-	man8/vigr.8 \
-	man8/vipw.8
+	man8/usermod.8
 
 man_nopam = \
 	man5/limits.5 \
diff -Naur shadow-4.2.1/man/sv/Makefile.am shadow-4.2.1-lunar/man/sv/Makefile.am
--- shadow-4.2.1/man/sv/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/sv/Makefile.am	2016-01-23 11:26:55.809313976 +0100
@@ -2,8 +2,6 @@
 
 # 2012.01.28 - activate manpages with more than 50% translated messages
 man_MANS = \
-	man1/chage.1 \
-	man1/chsh.1 \
 	man1/expiry.1 \
 	man5/faillog.5 \
 	man8/faillog.8 \
@@ -16,18 +14,14 @@
 	man8/grpck.8 \
 	man5/gshadow.5 \
 	man8/lastlog.8 \
-	man8/logoutd.8 \
 	man1/newgrp.1 \
-	man8/nologin.8 \
 	man1/passwd.1 \
 	man5/passwd.5 \
 	man8/pwck.8 \
 	man1/sg.1 \
 	man3/shadow.3 \
 	man5/suauth.5 \
-	man8/userdel.8 \
-	man8/vigr.8 \
-	man8/vipw.8
+	man8/userdel.8
 
 man_nopam = \
 	man5/limits.5 \
diff -Naur shadow-4.2.1/man/tr/Makefile.am shadow-4.2.1-lunar/man/tr/Makefile.am
--- shadow-4.2.1/man/tr/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/tr/Makefile.am	2016-01-23 11:27:43.269315633 +0100
@@ -1,16 +1,12 @@
 mandir = @mandir@/tr
 
 man_MANS = \
-	man1/chage.1 \
-	man1/chfn.1 \
 	man8/groupadd.8 \
 	man8/groupdel.8 \
 	man8/groupmod.8 \
-	man1/login.1 \
 	man1/passwd.1 \
 	man5/passwd.5 \
 	man5/shadow.5 \
-	man1/su.1 \
 	man8/useradd.8 \
 	man8/userdel.8 \
 	man8/usermod.8
diff -Naur shadow-4.2.1/man/zh_CN/Makefile.am shadow-4.2.1-lunar/man/zh_CN/Makefile.am
--- shadow-4.2.1/man/zh_CN/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/zh_CN/Makefile.am	2016-01-23 11:22:40.242638376 +0100
@@ -3,10 +3,8 @@
 
 man_MANS = \
 	man1/chage.1 \
-	man1/chfn.1 \
 	man8/chgpasswd.8 \
 	man8/chpasswd.8 \
-	man1/chsh.1 \
 	man1/expiry.1 \
 	man5/faillog.5 \
 	man8/faillog.8 \
@@ -22,12 +20,9 @@
 	man8/grpunconv.8 \
 	man5/gshadow.5 \
 	man8/lastlog.8 \
-	man1/login.1 \
 	man5/login.defs.5 \
-	man8/logoutd.8 \
 	man1/newgrp.1 \
 	man8/newusers.8 \
-	man8/nologin.8 \
 	man1/passwd.1 \
 	man5/passwd.5 \
 	man8/pwck.8 \
@@ -36,13 +31,10 @@
 	man1/sg.1 \
 	man3/shadow.3 \
 	man5/shadow.5 \
-	man1/su.1 \
 	man5/suauth.5 \
 	man8/useradd.8 \
 	man8/userdel.8 \
-	man8/usermod.8 \
-	man8/vigr.8 \
-	man8/vipw.8
+	man8/usermod.8
 
 man_nopam = \
 	man5/limits.5 \
diff -Naur shadow-4.2.1/man/zh_TW/Makefile.am shadow-4.2.1-lunar/man/zh_TW/Makefile.am
--- shadow-4.2.1/man/zh_TW/Makefile.am	2014-03-01 18:50:05.000000000 +0100
+++ shadow-4.2.1-lunar/man/zh_TW/Makefile.am	2016-01-23 11:26:32.939313176 +0100
@@ -2,15 +2,12 @@
 mandir = @mandir@/zh_TW
 
 man_MANS = \
-	man1/chfn.1 \
-	man1/chsh.1 \
 	man8/chpasswd.8 \
 	man1/newgrp.1 \
 	man8/groupadd.8 \
 	man8/groupdel.8 \
 	man8/groupmod.8 \
 	man5/passwd.5 \
-	man1/su.1 \
 	man8/useradd.8 \
 	man8/userdel.8 \
 	man8/usermod.8
diff -Naur shadow-4.2.1/src/Makefile.am shadow-4.2.1-lunar/src/Makefile.am
--- shadow-4.2.1/src/Makefile.am	2014-05-08 10:43:11.000000000 +0200
+++ shadow-4.2.1-lunar/src/Makefile.am	2016-01-23 11:20:23.665966937 +0100
@@ -22,9 +22,9 @@
 # and installation would be much simpler (just two directories,
 # $prefix/bin and $prefix/sbin, no install-data hacks...)
 
-bin_PROGRAMS   = groups login su
-sbin_PROGRAMS  = nologin
-ubin_PROGRAMS  = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
+bin_PROGRAMS   = groups
+sbin_PROGRAMS  = 
+ubin_PROGRAMS  = faillog lastlog chage expiry gpasswd newgrp passwd
 if ENABLE_SUBIDS
 ubin_PROGRAMS += newgidmap newuidmap
 endif
@@ -38,21 +38,19 @@
 	grpck \
 	grpconv \
 	grpunconv \
-	logoutd \
 	newusers \
 	pwck \
 	pwconv \
 	pwunconv \
 	useradd \
 	userdel \
-	usermod \
-	vipw
+	usermod
 
 # id and groups are from gnu, sulogin from sysvinit
 noinst_PROGRAMS = id sulogin
 
-suidbins       = su
-suidubins      = chage chfn chsh expiry gpasswd newgrp passwd newuidmap newgidmap
+suidbins       = 
+suidubins      = chage expiry gpasswd newgrp passwd newuidmap newgidmap
 if ACCT_TOOLS_SETUID
 	suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod
 endif
@@ -83,9 +81,7 @@
 chage_LDADD    = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)
 newuidmap_LDADD    = $(LDADD) $(LIBSELINUX)
 newgidmap_LDADD    = $(LDADD) $(LIBSELINUX)
-chfn_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD)
 chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBSELINUX) $(LIBCRYPT)
-chsh_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD)
 chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
 gpasswd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT)
 groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)
@@ -95,31 +91,20 @@
 grpck_LDADD    = $(LDADD) $(LIBSELINUX)
 grpconv_LDADD  = $(LDADD) $(LIBSELINUX)
 grpunconv_LDADD = $(LDADD) $(LIBSELINUX)
-login_SOURCES  = \
-	login.c \
-	login_nopam.c
-login_LDADD    = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD)
 newgrp_LDADD   = $(LDADD) $(LIBAUDIT) $(LIBCRYPT)
 newusers_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
-nologin_LDADD  =
 passwd_LDADD   = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT_NOPAM)
 pwck_LDADD     = $(LDADD) $(LIBSELINUX)
 pwconv_LDADD   = $(LDADD) $(LIBSELINUX)
 pwunconv_LDADD = $(LDADD) $(LIBSELINUX)
-su_SOURCES     = \
-	su.c \
-	suauth.c
-su_LDADD       = $(LDADD) $(LIBPAM) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD)
 sulogin_LDADD  = $(LDADD) $(LIBCRYPT)
 useradd_LDADD  = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR)
 userdel_LDADD  = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE)
 usermod_LDADD  = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR)
-vipw_LDADD     = $(LDADD) $(LIBSELINUX)
 
 install-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 	ln -sf newgrp	$(DESTDIR)$(ubindir)/sg
-	ln -sf vipw	$(DESTDIR)$(usbindir)/vigr
 	for i in $(suidbins); do \
 		chmod -f $(suidperms) $(DESTDIR)$(bindir)/$$i; \
 	done