diff --git a/racket/src/ChezScheme/mats/6.ms b/racket/src/ChezScheme/mats/6.ms
index 882be24f96..af58d8dcff 100644
--- a/racket/src/ChezScheme/mats/6.ms
+++ b/racket/src/ChezScheme/mats/6.ms
@@ -2996,7 +2996,7 @@
   (and (eqv? (get-mode "../mats") (get-mode "../mats/"))
        (eqv? (get-mode "../mats") (get-mode "../mats/.")))
   ; access times are unreliable on contemporary file systems
-  (time? (file-access-time "../../mats/mat.ss"))
+  (time? (file-access-time "mat.ss"))
   (time<=? (file-change-time "mat.ss") (file-change-time "mat.so"))
   (time<=? (file-modification-time "mat.ss") (file-modification-time "mat.so"))
   (equal?
diff --git a/racket/src/ChezScheme/mats/Mf-base b/racket/src/ChezScheme/mats/Mf-base
index 70cfc3e386..6f4a1b4b1b 100644
--- a/racket/src/ChezScheme/mats/Mf-base
+++ b/racket/src/ChezScheme/mats/Mf-base
@@ -34,6 +34,8 @@
 # For example, "make o=2 cp0=t ctb=8192" causes the mats to be run at
 # optimize level 2 with cp0 enabled and collect-trip-bytes set to 8192.
 
+include Mf-config
+
 ifeq (${OS},Windows_NT)
   dirsep = ;
 else
@@ -391,12 +393,12 @@ source:
 
 source$o: ${src} mat.ss oop.ss ht.ss cat_flush.c ${fsrc} freq.in freq.out m4test.in m4test.out script.all$o prettytest.ss ftype.h
 
-rootsrc = $(shell cd ../../mats; echo *)
+rootsrc = $(shell cd ${upupsrcdir}/mats; echo *)
 ${rootsrc}:
 ifeq ($(OS),Windows_NT)
-	cp -p ../../mats/$@ $@
+	cp -p ${upupsrcdir}/mats/$@ $@
 else
-	ln -s ../../mats/$@ $@
+	ln -s ${upupsrcdir}/mats/$@ $@
 endif
 
 prettytest.ss:
diff --git a/racket/src/ChezScheme/workarea b/racket/src/ChezScheme/workarea
index a71897a9cf..c06b594db5 100755
--- a/racket/src/ChezScheme/workarea
+++ b/racket/src/ChezScheme/workarea
@@ -380,4 +380,8 @@ cat > $W/Mf-config << END
 srcdir=$srcdir
 END
 
+cat > $W/mats/Mf-config << END
+upupsrcdir=$upupsrcdir
+END
+
 exit 0