diff --git a/Makefile b/Makefile
index 5129f1372e..42796733b7 100644
--- a/Makefile
+++ b/Makefile
@@ -459,7 +459,7 @@ native-cs-for-cross-finish:
 	cd racket/src/build/cross/cs/c; $(MAKE)
 
 racket/src/build/cross/cs/c/Makefile: racket/src/cs/c/configure racket/src/cs/c/Makefile.in
-	cd racket/src/build/cross/cs/c; ../../../../cs/c/configure
+	cd racket/src/build/cross/cs/c; ../../../../cs/c/configure --enable-csdefault
 
 # ------------------------------------------------------------
 # Both traditional Racket and RacketCS
diff --git a/racket/src/cs/c/Makefile.in b/racket/src/cs/c/Makefile.in
index aaba856719..5d70268194 100644
--- a/racket/src/cs/c/Makefile.in
+++ b/racket/src/cs/c/Makefile.in
@@ -438,6 +438,8 @@ macos-install-gracket:
 # ----------------------------------------
 # Reconfigure
 
+COMP_SUBDIR_CONFIGURE_ARGS=@COMP_SUBDIR_CONFIGURE_ARGS@
+
 CONFIGURE_SRCS = $(srcdir)/configure $(srcdir)/Makefile.in \
                  $(srcdir)/../../rktio/Makefile.in $(srcdir)/../../rktio/configure
 
@@ -445,4 +447,4 @@ reconfigure:
 	$(MAKE) Makefile
 
 Makefile: $(CONFIGURE_SRCS)
-	$(srcdir)/configure $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS)
+	$(srcdir)/configure $(COMP_SUBDIR_CONFIGURE_ARGS) $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS)
diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure
index 62c55fe106..2204c0c069 100755
--- a/racket/src/cs/c/configure
+++ b/racket/src/cs/c/configure
@@ -626,6 +626,7 @@ INSTALL_SETUP_RACKET_FLAGS
 INSTALL_SETUP_FLAGS
 RUN_RACKET
 CROSS_COMPILE_TARGET_KIND
+COMP_SUBDIR_CONFIGURE_ARGS
 CS_COMPILED_SUBDIR
 CS_INSTALLED
 FRAMEWORK_REL_INSTALL
@@ -2609,11 +2610,12 @@ if test "${enable_csdefault}" = "yes" ; then
 fi
 
 CS_COMPILED_SUBDIR=1
+COMP_SUBDIR_CONFIGURE_ARGS=
 if test "${enable_csdefault}" = "yes" ; then
   CS_COMPILED_SUBDIR=0
+  COMP_SUBDIR_CONFIGURE_ARGS=--enable-csdefault
 fi
 
-
 ############## Install targets ################
 
 PREFIX_PATH_RELATIVE=/../..
@@ -4970,6 +4972,7 @@ CPPFLAGS="$CPPFLAGS $PREFLAGS"
 
 
 
+
 
 
 makefiles="Makefile"
diff --git a/racket/src/cs/c/configure.ac b/racket/src/cs/c/configure.ac
index 53c040a7d2..648ae6dedb 100644
--- a/racket/src/cs/c/configure.ac
+++ b/racket/src/cs/c/configure.ac
@@ -93,11 +93,12 @@ if test "${enable_csdefault}" = "yes" ; then
 fi
 
 CS_COMPILED_SUBDIR=1
+COMP_SUBDIR_CONFIGURE_ARGS=
 if test "${enable_csdefault}" = "yes" ; then
   CS_COMPILED_SUBDIR=0
+  COMP_SUBDIR_CONFIGURE_ARGS=--enable-csdefault
 fi
 
-
 ############## Install targets ################
 
 PREFIX_PATH_RELATIVE=/../..
@@ -618,6 +619,7 @@ AC_SUBST(FRAMEWORK_PREFIX)
 AC_SUBST(FRAMEWORK_REL_INSTALL)
 AC_SUBST(CS_INSTALLED)
 AC_SUBST(CS_COMPILED_SUBDIR)
+AC_SUBST(COMP_SUBDIR_CONFIGURE_ARGS)
 AC_SUBST(CROSS_COMPILE_TARGET_KIND)
 AC_SUBST(RUN_RACKET)
 AC_SUBST(INSTALL_SETUP_FLAGS)