diff --git a/INSTALL.txt b/INSTALL.txt
index 9bb624af80..5b80746139 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -200,6 +200,10 @@ that with `SCHEME_SRC=...` instead of downloading a new copy.
 
   make cs RACKET=racket SCHEME_SRC=path/to/ChezScheme
 
+Use `make both` to build both traditional Racket and Racket-on-Chez,
+where packages are updated documentation is built only once (using
+traditional Racket).
+
 [*] For now, RacketCS requires the variant of Chez Scheme at
        https://github.com/mflatt/ChezScheme
 
diff --git a/Makefile b/Makefile
index 2058e09bc3..e30f019a2c 100644
--- a/Makefile
+++ b/Makefile
@@ -175,8 +175,7 @@ set-src-catalog:
 CONFIGURE_ARGS_qq =
 MORE_CONFIGURE_ARGS = 
 
-SELF_UP = 
-SELF_FLAGS_qq = SELF_RACKET_FLAGS="-G `cd $(SELF_UP)../../../build/config; pwd`"
+SELF_FLAGS_qq = SELF_RACKET_FLAGS="-G `cd ../../../build/config; pwd`"
 PLT_SETUP_OPTIONS_qq = PLT_SETUP_OPTIONS="$(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)"
 INSTALL_SETUP_ARGS = $(SELF_FLAGS_qq) $(PLT_SETUP_OPTIONS_qq) SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)"
 
@@ -328,7 +327,7 @@ cs-after-racket-with-racket:
 
 cs-after-racket-with-racket-and-scheme-src:
 	$(RACKET) -O "info@compiler/cm" $(ABS_BOOT) racket/src/cs/absify.rkt just-to-compile-absify
-	$(MAKE) cs-after-racket-with-abs-paths RACKET="$(ABS_RACKET)" SCHEME_SRC="$(ABS_SCHEME_SRC)" SELF_UP=../
+	$(MAKE) cs-after-racket-with-abs-paths RACKET="$(ABS_RACKET)" SCHEME_SRC="$(ABS_SCHEME_SRC)"
 
 cs-after-racket-with-abs-paths:
 	$(MAKE) racket/src/build/cs/c/Makefile
@@ -407,6 +406,14 @@ win32-just-cs:
 	racket\racket$(RACKETCS_SUFFIX) -G build\config -N raco -l- raco setup $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)
 	$(MAKE) $(WIN32_CS_SETUP_TARGET) WIN32_PLAIN_RACKET=racket\racket$(RACKETCS_SUFFIX) $(WIN32_CS_COPY_ARGS)
 
+# ------------------------------------------------------------
+# Both traditional Racket and RacketCS
+# ... but update packages and builds docs only once
+
+both:
+	$(MAKE) in-place
+	$(MAKE) cs CS_SETUP_TARGET=in-place-setup PLT_SETUP_OPTIONS="-D $(PLT_SETUP_OPTIONS)"
+
 # ------------------------------------------------------------
 # Configuration options for building installers