diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 83400bf3d..809ff934a 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-22  Pavel Roskin  <proski@gnu.org>
+
+	* mcserv.c: Remove old-style Linux-only support for shadow
+	passwords.
+	* Makefile.am: Remove reference to SHADOWLIB.
+
 2002-08-21  Andrew V. Samoilov  <sav@bcs.zp.ua>
 
 	* ftpfs.c (dir_load): Don't handle empty remote_path in special
diff --git a/vfs/Makefile.am b/vfs/Makefile.am
index 40558f105..d3edcd5da 100644
--- a/vfs/Makefile.am
+++ b/vfs/Makefile.am
@@ -102,7 +102,7 @@ endif
 
 mcserv_SOURCES = mcserv.c tcputil.c
 
-mcserv_LDFLAGS = $(SHADOWLIB) $(TERMNET) $(PAMLIBS) $(LCRYPT)
+mcserv_LDFLAGS = $(TERMNET) $(PAMLIBS) $(LCRYPT)
 
 SAMBA_DIST =			\
 	Makefile.in		\
diff --git a/vfs/mcserv.c b/vfs/mcserv.c
index 69b2df99b..1cb820df3 100644
--- a/vfs/mcserv.c
+++ b/vfs/mcserv.c
@@ -51,13 +51,6 @@
 #ifdef HAVE_GRP_H
 #    include <grp.h>
 #endif
-#ifdef HAVE_SHADOW_H
-#    include <shadow.h>
-#else
-#    ifdef HAVE_SHADOW_SHADOW_H
-#        include <shadow/shadow.h>
-#    endif
-#endif
 #ifdef HAVE_CRYPT_H
 #    include <crypt.h>
 #endif
@@ -820,32 +813,18 @@ static int do_ftp_auth (char *username, char *password)
     return 0;
 }
 
+#ifdef NEED_CRYPT_PROTOTYPE
+extern char *crypt (const char *, const char *);
+#endif
+
 static int do_classic_auth (char *username, char *password)
 {
     struct passwd *this;
     int ret;
-#ifdef LINUX_SHADOW
-    struct spwd *spw;
-    extern char *pw_encrypt (char *, char *);
-#else
-#ifdef NEED_CRYPT_PROTOTYPE
-    extern char *crypt (const char *, const char *);
-#endif
-#endif
     
     if ((this = getpwnam (username)) == 0)
 	return 0;
 
-#ifdef LINUX_SHADOW
-    if ((spw = getspnam (username)) == NULL)
-        this->pw_passwd = "*";
-    else
-        this->pw_passwd = spw->sp_pwdp;
-    if (strcmp (pw_encrypt (password, this->pw_passwd), this->pw_passwd) == 0)
-        ret = 1;
-    else
-        ret = 0;
-#else	
 #ifdef HAVE_CRYPT    
     if (strcmp (crypt (password, this->pw_passwd), this->pw_passwd) == 0){
 	ret = 1;
@@ -854,7 +833,6 @@ static int do_classic_auth (char *username, char *password)
     {
 	ret = 0;
     }
-#endif
     endpwent ();
     return ret;
 }