diff -urN shadow-20000902/src/Makefile.in shadow-20000902.new/src/Makefile.in
--- shadow-20000902/src/Makefile.in	Fri Jun 14 02:37:12 2002
+++ shadow-20000902.new/src/Makefile.in	Fri Jun 14 02:34:49 2002
@@ -170,7 +170,7 @@
 
 chfn_LDADD = ${LDADD} @LIBPAM@
 chsh_LDADD = ${LDADD} @LIBPAM@
-login_LDADD = ${LDADD} @LIBPAM@ -lrpcsvc
+login_LDADD = ${LDADD} @LIBPAM@
 passwd_LDADD = ${LDADD} @LIBCRACK@ @LIBPAM@
 su_LDADD = ${LDADD} @LIBPAM@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff -urN shadow-20000902/src/login.c shadow-20000902.new/src/login.c
--- shadow-20000902/src/login.c	Fri Jun 14 02:37:10 2002
+++ shadow-20000902.new/src/login.c	Fri Jun 14 02:36:46 2002
@@ -561,7 +561,11 @@
 	 */
 	checkutmp(!amroot);
 #endif
+#ifdef HAVE_UTMPX_H
+	STRFCPY(tty, utxent.ut_line);
+#else
 	STRFCPY(tty, utent.ut_line);
+#endif
 	is_console = console(tty);
 
 	if (rflg || hflg) {