diff --git a/ChangeLog b/ChangeLog
index ea2b9be30..d59680d30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-22  Werner Lemberg  <wl@gnu.org>
+
+	* builds/detect.mk: Undo change from 2004-11-20.
+	* builds/win32/detect.mk: If the `OS' environment variable contains
+	`Windows_NT', use `cmd.exe /c copy' for copying files.
+
 2004-11-20  Werner Lemberg  <wl@gnu.org>
 
 	* builds/detect.mk (dos_setup): Use `cmd.exe' for copying
diff --git a/builds/detect.mk b/builds/detect.mk
index ef0f541d9..eeb1300bc 100644
--- a/builds/detect.mk
+++ b/builds/detect.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2001, 2002, 2003, 2004 by
+# Copyright 1996-2000, 2001, 2002, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -153,7 +153,7 @@ dos_setup:
 	@echo Otherwise, simply type 'make' again to build the library.
 	@echo or 'make refdoc' to build the API reference (the latter needs python).
 	@type builds\newline
-	@cmd.exe /c @$(COPY) $(subst /,\,$(CONFIG_RULES) $(CONFIG_MK)) > nul
+	@$(COPY) $(subst /,\,$(CONFIG_RULES) $(CONFIG_MK)) > nul
 
 
 # EOF
diff --git a/builds/win32/detect.mk b/builds/win32/detect.mk
index f24538fdb..7f55e2c46 100644
--- a/builds/win32/detect.mk
+++ b/builds/win32/detect.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2003 by
+# Copyright 1996-2000, 2003, 2004 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -19,21 +19,26 @@
 ifeq ($(PLATFORM),ansi)
 
   # Detecting Windows NT is easy, as the OS variable must be defined and
-  # contains `Windows_NT'.  Untested with Windows 2K, but I guess it should
-  # work...
+  # contains `Windows_NT'.  This also works with W2K, XP, and Windows 98.
   #
   ifeq ($(OS),Windows_NT)
 
     is_windows := 1
 
+    # We have to use the shell for copying files to preserve the case of
+    # file names.  Without this, we get a `CONFIG.MK' file which isn't
+    # found later on by `make'.
+    COPY := cmd.exe /c copy
+
+  else
     # We test for the COMSPEC environment variable, then run the `ver'
     # command-line program to see if its output contains the word `Windows'.
     #
     # If this is true, we are running a win32 platform (or an emulation).
     #
-  else
     ifdef COMSPEC
       is_windows := $(findstring Windows,$(strip $(shell ver)))
+      COPY := copy
     endif
   endif  # test NT
 
@@ -47,7 +52,6 @@ endif # test PLATFORM ansi
 ifeq ($(PLATFORM),win32)
 
   DELETE := del
-  COPY   := copy
   SEP    := $(BACKSLASH)
 
   # gcc Makefile by default