diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 7afa18725..cef8b85e0 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,5 +1,9 @@
 2004-01-22  Pavel Roskin  <proski@gnu.org>
 
+	* mcserv.c: Use HAVE_CRYPT instead of USE_CRYPT.  Remove
+	references to HAVE_LIBCRYPT and HAVE_LIBCRYPT_I.  Reported by
+	Christian Laubscher <christian.laubscher@tiscalinet.ch>
+
 	* samba/configure.in: Rename to ...
 	* samba/configure.ac: ... this.  Adjust dependencies.
 
diff --git a/vfs/mcserv.c b/vfs/mcserv.c
index c70d9495b..a10427a61 100644
--- a/vfs/mcserv.c
+++ b/vfs/mcserv.c
@@ -86,10 +86,6 @@
 #    include <crypt.h>
 #endif				/* !HAVE_CRYPT_H */
 
-#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBCRYPT_I)
-#    define USE_CRYPT
-#endif
-
 #ifdef HAVE_SHADOW_H
 #    include <shadow.h>
 #else
@@ -886,7 +882,7 @@ do_ftp_auth (char *username, char *password)
     return 0;
 }
 
-#ifdef USE_CRYPT
+#ifdef HAVE_CRYPT
 static int
 do_classic_auth (char *username, char *password)
 {
@@ -920,7 +916,7 @@ do_classic_auth (char *username, char *password)
     endpwent ();
     return ret;
 }
-#endif				/* USE_CRYPT */
+#endif				/* HAVE_CRYPT */
 #endif				/* !HAVE_PAM */
 
 /* Try to authenticate the user based on:
@@ -947,7 +943,7 @@ do_auth (char *username, char *password)
 	auth = 1;
     else
 #endif
-#ifdef USE_CRYPT
+#ifdef HAVE_CRYPT
     if (do_classic_auth (username, password))
 	auth = 1;
     else