diff --git a/Makefile b/Makefile
index 9ce2e606aa..9f293f653d 100644
--- a/Makefile
+++ b/Makefile
@@ -323,7 +323,7 @@ cs-with-configure:
 	$(MAKE) racket/src/build/cs/c/Makefile
 	cd racket/src/build/cs/c; $(MAKE)
 	$(MAKE) base-config
-	cd racket/src/build; $(MAKE) install-cs CS_INSTALLED=$(RACKETCS_SUFFIX) $(INSTALL_SETUP_ARGS)
+	cd racket/src/build/cs/c; $(MAKE) install CS_INSTALLED=$(RACKETCS_SUFFIX) $(INSTALL_SETUP_ARGS)
 	$(MAKE) cs-setup$(CS_CROSS_SUFFIX)
 
 cs-setup:
@@ -335,18 +335,9 @@ cs-setup-cross:
 nothing-after-base:
 	echo base done
 
-CS_CONFIG_TARGET = run-cfg-cs
-
 racket/src/build/cs/c/Makefile: racket/src/cs/c/configure racket/src/cs/c/Makefile.in racket/src/cfg-cs
 	mkdir -p cd racket/src/build/cs/c
 	cd racket/src/build/cs/c; ../../../cs/c/configure $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS)
-	$(MAKE) $(CS_CONFIG_TARGET)
-
-run-cfg-cs:
-	cd racket/src/build; ../cfg-cs $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS)
-
-no-cfg-cs:
-	echo done
 
 no-fetch-pb:
 	echo done
@@ -443,7 +434,7 @@ both:
 	$(MAKE) also-cs IN_PLACE_SETUP_OPTIONS="--error-in build/step"
 
 also-cs:
-	$(MAKE) cs CS_SETUP_TARGET=in-place-setup PLT_SETUP_OPTIONS="-D $(PLT_SETUP_OPTIONS)" CS_CONFIG_TARGET=no-cfg-cs
+	$(MAKE) cs CS_SETUP_TARGET=in-place-setup PLT_SETUP_OPTIONS="-D $(PLT_SETUP_OPTIONS)"
 
 win32-both:
 	$(MAKE) win32-in-place
diff --git a/racket/src/cs/c/Makefile.in b/racket/src/cs/c/Makefile.in
index 671b629e16..9b0cc914e0 100644
--- a/racket/src/cs/c/Makefile.in
+++ b/racket/src/cs/c/Makefile.in
@@ -60,7 +60,8 @@ collectsdir = @collectsdir@
 configdir = @etcpltdir@
 
 ALLDIRINFO = "$(DESTDIR)$(bindir)" \
-             "$(DESTDIR)$(libpltdir)"
+             "$(DESTDIR)$(libpltdir)" \
+             "$(DESTDIR)$(includepltdir)"
 
 # Defines FWVERSION:
 mainsrcdir = @srcdir@/../..
diff --git a/racket/src/pkgs-config.rkt b/racket/src/pkgs-config.rkt
index d956320e23..d1d8aef17c 100644
--- a/racket/src/pkgs-config.rkt
+++ b/racket/src/pkgs-config.rkt
@@ -1,7 +1,8 @@
 #lang racket/base
 (require racket/cmdline
          racket/format
-         racket/path)
+         racket/path
+         racket/file)
 
 ;; Adjust the configuration to consult a catalog that is
 ;; expected to map some packages to directory links.
@@ -58,6 +59,8 @@
 
 (unless (file-exists? config-file-path)
   (printf "Writing ~a\n" config-file-path)
+  (let-values ([(base name dir?) (split-path config-file-path)])
+    (when (path? base) (make-directory* base)))
   (call-with-output-file*
    config-file-path
    (lambda (o)