diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 1d626d9204..e47d172a72 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -357,8 +357,9 @@ $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 
 # If taking wxWindows from CVS, setup.h doesn't exist yet.
 $(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
-    -copy "$(WXDIR)"\include\wx\msw\setup.h "$(WXDIR)"\include\wx\msw\setup.bak
-    if not exist "$(WXDIR)"\include\wx\msw\setup.h copy "$(WXDIR)"\include\wx\msw\setup0.h "$(WXDIR)"\include\wx\msw\setup.h 
+    cd "$(WXDIR)"\include\wx\msw
+    if not exist setup.h copy setup0.h setup.h
+    cd "$(WXDIR)"\src\msw
 
 ..\common\$D\extended.obj:     ..\common\extended.c
         cl @<<