diff --git a/ChangeLog b/ChangeLog
index 2951b647..46905616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-16  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+	* windows/config.h.ms: snprintf and vsnprintf exist under Windows.
+
+	* windows/Makefile.src: Back out previous change.
+
 2000-11-16  Herold Heiko  <Heiko.Herold@previnet.it>
 
 	* windows/Makefile.src: Compile in vsnprintf.c.
diff --git a/src/ChangeLog b/src/ChangeLog
index 1b9f4a02..29f99623 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-16  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+	* mswindows.h: Define snprintf and vsnprintf to _snprintf and
+	_vsnprintf respectively.
+
 2000-11-15  Hrvoje Niksic  <hniksic@arsdigita.com>
 
 	* config.h.in: Do the _XOPEN_SOURCE and _SVID_SOURCE things only
diff --git a/src/mswindows.h b/src/mswindows.h
index 6a3a1ea2..03ab6cd2 100644
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -31,6 +31,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define strcasecmp stricmp
 #define strncasecmp strnicmp
 
+/* The same for snprintf() and vsnprintf().  */
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+
 /* No stat on Windows.  */
 #define lstat stat
 
diff --git a/windows/Makefile.src b/windows/Makefile.src
index 5c21b212..9f2a2067 100644
--- a/windows/Makefile.src
+++ b/windows/Makefile.src
@@ -48,11 +48,11 @@ RM      = del
 
 SRC = alloca.c cmpt.c connect.c host.c http.c netrc.c ftp-basic.c ftp.c ftp-ls.c \
       ftp-opie.c getopt.c headers.c html.c retr.c recur.c url.c init.c utils.c main.c \
-      version.c mswindows.c fnmatch.c md5.c rbuf.c log.c snprintf.c
+      version.c mswindows.c fnmatch.c md5.c rbuf.c log.c
 
 OBJ = alloca$o cmpt$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o ftp-ls$o \
       ftp-opie$o headers$o html$o retr$o recur$o url$o init$o utils$o main$o \
-      getopt$o version$o mswindows$o fnmatch$o md5$o rbuf$o log$o snprintf$o
+      getopt$o version$o mswindows$o fnmatch$o md5$o rbuf$o log$o
 
 .SUFFIXES: .c .obj
 
diff --git a/windows/config.h.ms b/windows/config.h.ms
index 7c5fa22c..307dd4c7 100644
--- a/windows/config.h.ms
+++ b/windows/config.h.ms
@@ -107,6 +107,12 @@ char *alloca ();
 /* Define if you have the strerror function. */
 #define HAVE_STRERROR 1
 
+/* Define if you have the snprintf function.  */
+#undef HAVE_SNPRINTF
+
+/* Define if you have the vsnprintf function.  */
+#undef HAVE_VSNPRINTF
+
 /* Define if you have the strstr function. */
 #define HAVE_STRSTR 1