diff --git a/racket/src/cs/c/Makefile.in b/racket/src/cs/c/Makefile.in
index fdf7eb96a4..38c984af12 100644
--- a/racket/src/cs/c/Makefile.in
+++ b/racket/src/cs/c/Makefile.in
@@ -477,8 +477,10 @@ common-install:
 	$(MAKE) include-install
 	$(MAKE) common-@INSTALL_LIBS_ENABLE@-libs
 
+SYSTEM_RKTD = $(DESTDIR)$(libpltdir)/system$(CS_INSTALLED).rktd
+
 system-install:
-	$(RACKET) -cu "$(srcdir)/gen-system.rkt" $(DESTDIR)$(libpltdir)/system$(CS_INSTALLED).rktd $(TARGET_MACH) @CROSS_COMPILE_TARGET_KIND@ "$(srcdir)"
+	$(RACKET) -cu "$(srcdir)/gen-system.rkt" $(SYSTEM_RKTD) $(TARGET_MACH) @CROSS_COMPILE_TARGET_KIND@ "$(srcdir)" "@PLT_CS_SLSP_SUFFIX@"
 
 include-install:
 	$(ICP) $(srcdir)/api.h "$(DESTDIR)$(includepltdir)/racketcs.h"
diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure
index 61ec6d7f39..795ccdaa1f 100755
--- a/racket/src/cs/c/configure
+++ b/racket/src/cs/c/configure
@@ -622,6 +622,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+PLT_CS_SLSP_SUFFIX
 INSTALL_LIBS_ENABLE
 INSTALL_SETUP_RACKET_FLAGS
 INSTALL_SETUP_FLAGS
@@ -3198,6 +3199,8 @@ LZ4_LIB_DEP='$(OWN_LZ4_LIB)'
 LZ4_LIB='$(OWN_LZ4_LIB)'
 LZ4_LIB_UNPACK='$(AR) x $(OWN_LZ4_LIB)'
 
+PLT_CS_SLSP_SUFFIX=
+
 enable_pthread_by_default=yes
 
 cs_auto_flags=--disable-auto-flags
@@ -4756,6 +4759,7 @@ fi
 
 if test "${enable_natipkg}" = "yes" ; then
   CONFIGURE_RACKET_SO_COMPILE="${CONFIGURE_RACKET_SO_COMPILE} env PLT_CS_SLSP_SUFFIX=-natipkg"
+  PLT_CS_SLSP_SUFFIX="-natipkg"
 fi
 
 ############## ubsan ################
@@ -5536,6 +5540,8 @@ if test "${enable_shared}" = "yes" ; then
   STRIP_LIB_DEBUG=":"
   LIBSFX=la
   ICP_LIB="${LIBTOOLPROG} --mode=install install -s"
+
+  CONFIGURE_RACKET_SO_COMPILE="env PLT_CS_MAKE_LINK_SHARED=y"
 else
   ICP=cp
   LTO="o"
@@ -5637,6 +5643,7 @@ SCHEME_CROSS_CONFIG_ARGS="--machine=${TARGET_MACH} --disable-x11 ${cs_auto_flags
 
 
 
+
 
 
 makefiles="Makefile"
diff --git a/racket/src/cs/c/configure.ac b/racket/src/cs/c/configure.ac
index 56ffbcb82a..f3acaf89ad 100644
--- a/racket/src/cs/c/configure.ac
+++ b/racket/src/cs/c/configure.ac
@@ -157,6 +157,8 @@ LZ4_LIB_DEP='$(OWN_LZ4_LIB)'
 LZ4_LIB='$(OWN_LZ4_LIB)'
 LZ4_LIB_UNPACK='$(AR) x $(OWN_LZ4_LIB)'
 
+PLT_CS_SLSP_SUFFIX=
+
 enable_pthread_by_default=yes
 
 cs_auto_flags=--disable-auto-flags
@@ -483,6 +485,7 @@ m4_include(../ac/strip.m4)
 
 if test "${enable_natipkg}" = "yes" ; then
   CONFIGURE_RACKET_SO_COMPILE="${CONFIGURE_RACKET_SO_COMPILE} env PLT_CS_SLSP_SUFFIX=-natipkg"
+  PLT_CS_SLSP_SUFFIX="-natipkg"
 fi
 
 ############## ubsan ################
@@ -765,6 +768,7 @@ AC_SUBST(RUN_RACKET)
 AC_SUBST(INSTALL_SETUP_FLAGS)
 AC_SUBST(INSTALL_SETUP_RACKET_FLAGS)
 AC_SUBST(INSTALL_LIBS_ENABLE)
+AC_SUBST(PLT_CS_SLSP_SUFFIX)
 
 makefiles="Makefile"
 
diff --git a/racket/src/cs/c/gen-system.rkt b/racket/src/cs/c/gen-system.rkt
index d4a3d0af7b..7cd21d9cdd 100644
--- a/racket/src/cs/c/gen-system.rkt
+++ b/racket/src/cs/c/gen-system.rkt
@@ -1,9 +1,10 @@
 (module gen-system '#%kernel
   
-  ;; Command-line argument: <dest-file> <target-machine> <cross-target-machine> <srcdir>
+  ;; Command-line argument: <dest-file> <target-machine> <cross-target-machine> <srcdir> <slsp-suffix>
 
   (define-values (machine) (string->symbol (vector-ref (current-command-line-arguments) 1)))
   (define-values (srcdir) (vector-ref (current-command-line-arguments) 3))
+  (define-values (slsp-suffix) (vector-ref (current-command-line-arguments) 4))
 
   (define-values (definitions)
     (call-with-input-file
@@ -93,15 +94,17 @@
   (define-values (so-suffix) (lookup 'so-suffix-bytes))
 
   (define-values (lib-subpath)
-    (if (eq? machine 'ta6nt)
-        "win32\\x86_64"
-        (if (eq? machine 'a6nt)
-            "win32\\x86_64"
-            (if (eq? machine 'ti3nt)
-                "win32\\i386"
-                (if (eq? machine 'ti3nt)
-                    "win32\\i386"
-                    (format "~a-~a" arch os*))))))
+    (string-append
+     (if (eq? machine 'ta6nt)
+         "win32\\x86_64"
+         (if (eq? machine 'a6nt)
+             "win32\\x86_64"
+             (if (eq? machine 'ti3nt)
+                 "win32\\i386"
+                 (if (eq? machine 'ti3nt)
+                     "win32\\i386"
+                     (format "~a-~a" arch os*)))))
+     slsp-suffix))
 
   (define-values (ht)
     (hash 'os os