diff --git a/racket/src/bc/Makefile.in b/racket/src/bc/Makefile.in
index 51f06d1bfa..7bdfc45163 100644
--- a/racket/src/bc/Makefile.in
+++ b/racket/src/bc/Makefile.in
@@ -21,7 +21,7 @@ builddir = @builddir@
 
 # for version.mak:
 mainsrcdir = @srcdir@/..
-@INCLUDEDEP@ @srcdir@/version.mak
+@INCLUDEDEP@ @srcdir@/../version/version.mak
 
 NOOP = :
 
diff --git a/racket/src/bc/gc2/Makefile.in b/racket/src/bc/gc2/Makefile.in
index a447787ed5..80157c1f65 100644
--- a/racket/src/bc/gc2/Makefile.in
+++ b/racket/src/bc/gc2/Makefile.in
@@ -13,7 +13,7 @@ collectsdir = @collectsdir@
 
 # for version.mak:
 mainsrcdir = @srcdir@/../..
-@INCLUDEDEP@ @srcdir@/../version.mak
+@INCLUDEDEP@ @srcdir@/../../version/version.mak
 
 CC = @CC@
 CPP = @CPP@
diff --git a/racket/src/bc/gracket/Makefile.in b/racket/src/bc/gracket/Makefile.in
index d60ca5aa3b..3ad20a1c8a 100644
--- a/racket/src/bc/gracket/Makefile.in
+++ b/racket/src/bc/gracket/Makefile.in
@@ -19,7 +19,7 @@ builddir = @builddir@
 
 # for version.mak:
 mainsrcdir = @srcdir@/../..
-@INCLUDEDEP@ @srcdir@/../version.mak
+@INCLUDEDEP@ @srcdir@/../../version/version.mak
 
 WXDIR = $(srcdir)/../wxxt
 
diff --git a/racket/src/bc/gracket/gc2/Makefile.in b/racket/src/bc/gracket/gc2/Makefile.in
index 342732ab69..46a4fb5045 100644
--- a/racket/src/bc/gracket/gc2/Makefile.in
+++ b/racket/src/bc/gracket/gc2/Makefile.in
@@ -14,7 +14,7 @@ collectsdir = @collectsdir@
 
 # for version.mak:
 mainsrcdir = @srcdir@/../../..
-@INCLUDEDEP@ @srcdir@/../../version.mak
+@INCLUDEDEP@ @srcdir@/../../../version/version.mak
 
 PLTSRCDIR = $(srcdir)/../../..
 BCBUILDDIR = $(builddir)/../..
diff --git a/racket/src/bc/sgc/Makefile.in b/racket/src/bc/sgc/Makefile.in
index 3f270386fb..13d65d0039 100644
--- a/racket/src/bc/sgc/Makefile.in
+++ b/racket/src/bc/sgc/Makefile.in
@@ -9,7 +9,7 @@ libdir = @libdir@
 
 # for version.mak:
 mainsrcdir = @srcdir@/../..
-@INCLUDEDEP@ @srcdir@/../version.mak
+@INCLUDEDEP@ @srcdir@/../../version/version.mak
 
 CC = @CC@
 CXX = @CXX@
diff --git a/racket/src/cs/c/Makefile.in b/racket/src/cs/c/Makefile.in
index 6250ada76e..6f9e2c80dc 100644
--- a/racket/src/cs/c/Makefile.in
+++ b/racket/src/cs/c/Makefile.in
@@ -65,7 +65,7 @@ ALLDIRINFO = "$(DESTDIR)$(bindir)" \
 
 # Defines FWVERSION:
 mainsrcdir = @srcdir@/../..
-@INCLUDEDEP@ @srcdir@/../../racket/version.mak
+@INCLUDEDEP@ @srcdir@/../../version/version.mak
 
 cs:
 	$(MAKE) scheme@T_CROSS_MODE@
@@ -108,12 +108,12 @@ bounce:
 
 scheme:
 	if [ "$(BOOTFILE_RACKET)" != "$(DEFAULT_RACKET)" ] ; \
-          then $(MAKE) scheme-via-rktboot ; \
+          then $(MAKE) scheme-via-rktboot BOOTFILE_RACKET="$(BOOTFILE_RACKET)" ; \
           else $(MAKE) scheme-via-pb ; fi
 
 scheme-via-rktboot:
 	if [ "$(BOOTFILE_RACKET)" != "$(RACKET)" ] ; \
-          then $(MAKE) scheme-via-rktboot-at BOOT_COMPILED_SUBDIR=/bf ; \
+          then $(MAKE) scheme-via-rktboot-at BOOT_COMPILED_SUBDIR=/bf BOOTFILE_RACKET="$(BOOTFILE_RACKET)" ; \
           else $(MAKE) scheme-via-rktboot-at ; fi
 
 scheme-via-rktboot-at:
diff --git a/racket/src/cs/c/check_boot.sh b/racket/src/cs/c/check_boot.sh
index 114348fc02..e8ad19c922 100644
--- a/racket/src/cs/c/check_boot.sh
+++ b/racket/src/cs/c/check_boot.sh
@@ -13,7 +13,6 @@ check_pb()
     if [ ! -e $DEST ] ; then
         touch boot_pending
     elif [ "`/usr/bin/find "$SRC" -newer "$DEST"`" != "" ] ; then
-        echo older
         touch boot_pending
     fi
 }
diff --git a/racket/src/bc/version.mak b/racket/src/version/version.mak
similarity index 100%
rename from racket/src/bc/version.mak
rename to racket/src/version/version.mak