diff --git a/src/ChangeLog b/src/ChangeLog
index 8bd9f243..2c4494a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-08  Gisle Vanem  <giva@bgnett.no>
+
+	* ftp-basic.c: Support Windows-2000 ftp servers. Win-2000 *is*
+	Win-NT 5.0 so calling it ST_WINNT is okay I guess.
+
 2003-11-08  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* progress.c (update_speed_ring): Clear the speed ring when the
diff --git a/src/ftp-basic.c b/src/ftp-basic.c
index 5c60ccfb..350d3103 100644
--- a/src/ftp-basic.c
+++ b/src/ftp-basic.c
@@ -1090,7 +1090,8 @@ ftp_syst (struct rbuf *rbuf, enum stype *server_type)
     *server_type = ST_VMS;
   else if (!strcasecmp (request, "UNIX"))
     *server_type = ST_UNIX;
-  else if (!strcasecmp (request, "WINDOWS_NT"))
+  else if (!strcasecmp (request, "WINDOWS_NT")
+	   || !strcasecmp (request, "WINDOWS2000"))
     *server_type = ST_WINNT;
   else if (!strcasecmp (request, "MACOS"))
     *server_type = ST_MACOS;