diff -ru shadow-4.0.3/libmisc/age.c shadow-4.0.3-new/libmisc/age.c
--- shadow-4.0.3/libmisc/age.c	2001-12-22 07:59:30.000000000 +0100
+++ shadow-4.0.3-new/libmisc/age.c	2002-04-02 23:38:48.000000000
+0200
@@ -107,7 +107,9 @@

 	endspent ();
 	endpwent ();
+#ifdef SHADOWGRP
 	endsgent ();
+#endif
 	endgrent ();

 	/*
diff -ru shadow-4.0.3/libmisc/pwdcheck.c
shadow-4.0.3-new/libmisc/pwdcheck.c
--- shadow-4.0.3/libmisc/pwdcheck.c	2000-10-15 19:07:26.000000000
+0200
+++ shadow-4.0.3-new/libmisc/pwdcheck.c	2002-04-02
23:40:55.000000000 +0200
@@ -6,6 +6,7 @@
 #include "prototypes.h"
 #include "defines.h"

+#include <stdio.h>
 #include <pwd.h>
 #include "pwauth.h"

diff -ru shadow-4.0.3/man/Makefile.am shadow-4.0.3-new/man/Makefile.am
--- shadow-4.0.3/man/Makefile.am	2002-03-13 09:35:46.000000000
+0100
+++ shadow-4.0.3-new/man/Makefile.am	2002-04-02 23:38:48.000000000
+0200
@@ -1,6 +1,6 @@

 # subdirectories for translated manual pages
-SUBDIRS = cs de fr hu id it ja ko pl pt_BR
+SUBDIRS =

 man_MANS = \
 	adduser.8 \
@@ -41,13 +41,13 @@
 	useradd.8 \
 	userdel.8 \
 	usermod.8 \
+	groups.1 \
 	vigr.8 \
 	vipw.8

 EXTRA_DIST = $(man_MANS) \
 	dpasswd.8 \
 	getspnam.3 \
-	groups.1 \
 	id.1 \
 	pw_auth.3 \
 	pwauth.8 \
diff -ru shadow-4.0.3/src/Makefile.am shadow-4.0.3-new/src/Makefile.am
--- shadow-4.0.3/src/Makefile.am	2002-03-10 08:12:52.000000000
+0100
+++ shadow-4.0.3-new/src/Makefile.am	2002-04-02 23:38:48.000000000
+0200
@@ -21,8 +21,8 @@
 # and installation would be much simpler (just two directories,
 # $prefix/bin and $prefix/sbin, no install-data hacks...)

-bin_PROGRAMS = groups login su
-ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
+bin_PROGRAMS = login su
+ubin_PROGRAMS = groups faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
 usbin_PROGRAMS = chpasswd dpasswd groupadd groupdel groupmod \
 	logoutd mkpasswd newusers useradd userdel usermod grpck \
 	pwck vipw grpconv grpunconv pwconv pwunconv
diff -ru shadow-4.0.3/src/login.c shadow-4.0.3-new/src/login.c
--- shadow-4.0.3/src/login.c	2002-03-08 05:30:28.000000000 +0100
+++ shadow-4.0.3-new/src/login.c	2002-04-02 23:38:48.000000000
+0200
@@ -848,13 +848,8 @@
 			}
 			preauth_flag = 0;
 #ifndef LOGIN_PROMPT
-#ifdef __linux__		/* hostname login: - like in util-linux login */
-			login_prompt (_("\n%s login: "), username,
-				      sizeof username);
-#else
 			login_prompt (_("login: "), username,
 				      sizeof username);
-#endif
 #else
 			login_prompt (LOGIN_PROMPT, username,
 				      sizeof username);