diff --git a/racket/src/cs/c/Makefile.in b/racket/src/cs/c/Makefile.in
index a3841525f1..e749fc8da1 100644
--- a/racket/src/cs/c/Makefile.in
+++ b/racket/src/cs/c/Makefile.in
@@ -157,7 +157,7 @@ scheme-cross:
 
 # Rebuild cross "petite.boot" and "scheme.boot" when older
 # than the build-host "scheme.boot"
-@SCHEME_SRC@/@TARGET_MACH@/boot/@TARGET_MACH@/scheme.boot: @SCHEME_SRC@/@MACH@/boot/@MACH@/scheme.boot
+@SCHEME_SRC@/@TARGET_MACH@/boot/@TARGET_MACH@/scheme.boot@DIFF_MACH@: @SCHEME_SRC@/@MACH@/boot/@MACH@/scheme.boot
 	cd @SCHEME_SRC@/@TARGET_MACH@/s && $(MAKE) -f Mf-cross m=@MACH@ xm=@TARGET_MACH@ Scheme="$(SCHEME_BIN)" SCHEMEHEAPDIRS="$(SCHEME_INC)"
 
 XPATCH =
@@ -277,7 +277,7 @@ grres.o: $(srcdir)/../../worksp/gracket/gracket.rc $(srcdir)/../../worksp/gracke
 libres.o: $(srcdir)/../../worksp/cs/libracket.rc
 	@WINDRES@ -i $(srcdir)/../../worksp/cs/libracket.rc -o libres.o
 
-starter:
+starter@MINGW@:
 	$(MAKE) MzStart.exe
 	$(MAKE) MrStart.exe
 
diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure
index 1168bba9e9..b9834f327f 100755
--- a/racket/src/cs/c/configure
+++ b/racket/src/cs/c/configure
@@ -642,6 +642,7 @@ OSX
 TT_CROSS_MODE
 T_CROSS_MODE
 CROSS_MODE
+DIFF_MACH
 TARGET_MACH
 MACH
 SCHEME_DIR
@@ -4135,6 +4136,11 @@ if test "${enable_compress}" = "yes" ; then
   COMPRESS_COMP="--compress"
 fi
 
+DIFF_MACH=skip
+if test "${MACH}" != "${TARGET_MACH}" ; then
+  DIFF_MACH=
+fi
+
 ############## Strip tool ################
 
 if test "${enable_strip}" = "" ; then
@@ -4959,6 +4965,7 @@ CPPFLAGS="$CPPFLAGS $PREFLAGS"
 
 
 
+
 
 
 makefiles="Makefile"
diff --git a/racket/src/cs/c/configure.ac b/racket/src/cs/c/configure.ac
index f37ebd78d0..aca56f3fa3 100644
--- a/racket/src/cs/c/configure.ac
+++ b/racket/src/cs/c/configure.ac
@@ -392,6 +392,11 @@ if test "${enable_compress}" = "yes" ; then
   COMPRESS_COMP="--compress"
 fi
 
+DIFF_MACH=skip
+if test "${MACH}" != "${TARGET_MACH}" ; then
+  DIFF_MACH=
+fi
+
 ############## Strip tool ################
 
 m4_include(../ac/strip.m4)
@@ -595,6 +600,7 @@ AC_SUBST(RACKET)
 AC_SUBST(SCHEME_DIR)
 AC_SUBST(MACH)
 AC_SUBST(TARGET_MACH)
+AC_SUBST(DIFF_MACH)
 AC_SUBST(CROSS_MODE)
 AC_SUBST(T_CROSS_MODE)
 AC_SUBST(TT_CROSS_MODE)