diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 7fb2d7fd44..f1c494ef52 100644
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -343,9 +343,12 @@ $(ARCHINCDIR)/wx:
 	mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
 	mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
-$(SETUP_H): $(ARCHINCDIR)/wx
-	$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
+# Copy ALWAYS uses forward slashes now.
 
+$(SETUP_H): $(ARCHINCDIR)/wx
+	$(COPY) $(WXDIR)/include/wx/msw/setup.h $(subst $(BACKSLASH),/,$@)
+
+#	$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
 #	$(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
 
 ifndef WXMAKINGDLL
diff --git a/src/makeg95.env b/src/makeg95.env
index 39f402da26..ce6abdea7d 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -15,8 +15,14 @@
 MINGW32=1
 
 # Set to the version you have
-#MINGW32VERSION=2.95
-MINGW32VERSION=3.0
+MINGW32VERSION=2.95
+#MINGW32VERSION=3.0
+
+# If we're using MSYS, or other utilities that
+# use forward slashes, we need to set this when
+# invoking the makefile from DOS, or the wrong separators
+# will be assumed.
+OSTYPE=msys
 
 # If building DLL, the version
 WXVERSION=233
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 1043e14499..74e523f6d3 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -546,9 +546,12 @@ $(ARCHINCDIR)/wx:
 	mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
 	mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
-$(SETUP_H): $(ARCHINCDIR)/wx
-	$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
+# Copy ALWAYS uses forward slashes now.
 
+$(SETUP_H): $(ARCHINCDIR)/wx
+	$(COPY) $(WXDIR)/include/wx/msw/setup.h $(subst $(BACKSLASH),/,$@)
+
+#	$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
 #	$(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
 
 ifndef WXMAKINGDLL