diff --git a/src/configure b/src/configure
index 295e7b9819..08062f6ff2 100755
--- a/src/configure
+++ b/src/configure
@@ -680,6 +680,7 @@ AS
 AR
 STATIC_AR
 ARFLAGS
+STRIP_DEBUG
 WBUILD
 CC_FOR_BUILD
 REZ
@@ -2286,6 +2287,8 @@ CGC_INSTALLED=cgc
 CGC_CAP_INSTALLED=CGC
 MAIN_VARIANT=3m
 
+STRIP_DEBUG=":"
+
 ###### OSKit stuff #######
 
 if test "${enable_oskit}" = "yes" ; then
@@ -5801,6 +5804,7 @@ case $OS in
     LIBS="$LIBS -ldl -lm -rdynamic"
     DYN_CFLAGS="-fPIC"
     GC_THREADS_FLAG="-DGC_LINUX_THREADS"
+    STRIP_DEBUG="strip -S"
     # PPC: X11 librares are not found
     case `$UNAME -m` in
       #Required for CentOS 4.6
@@ -5872,6 +5876,8 @@ case $OS in
 
     PREFLAGS="$PREFLAGS -DOS_X -D_DARWIN_UNLIMITED_SELECT"
 
+    STRIP_DEBUG="/usr/bin/strip -S"
+
     # zlib comes with the OS
     ZLIB_A=""
     ZLIB_INC=""
@@ -11931,6 +11937,7 @@ LIBS="$LIBS $EXTRALIBS"
 
 
 
+
 
 
 mk_needed_dir()
@@ -12787,6 +12794,7 @@ AS!$AS$ac_delim
 AR!$AR$ac_delim
 STATIC_AR!$STATIC_AR$ac_delim
 ARFLAGS!$ARFLAGS$ac_delim
+STRIP_DEBUG!$STRIP_DEBUG$ac_delim
 WBUILD!$WBUILD$ac_delim
 CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim
 REZ!$REZ$ac_delim
@@ -12817,7 +12825,6 @@ MREDLINKER!$MREDLINKER$ac_delim
 LIBSFX!$LIBSFX$ac_delim
 WXLIBS!$WXLIBS$ac_delim
 WXVARIANT!$WXVARIANT$ac_delim
-ICP!$ICP$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -12859,6 +12866,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+ICP!$ICP$ac_delim
 MRLIBINSTALL!$MRLIBINSTALL$ac_delim
 LIBFINISH!$LIBFINISH$ac_delim
 MAKE_MRED!$MAKE_MRED$ac_delim
@@ -12900,7 +12908,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 39; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/src/mred/Makefile.in b/src/mred/Makefile.in
index cd56ba0b72..785664c3a1 100644
--- a/src/mred/Makefile.in
+++ b/src/mred/Makefile.in
@@ -350,7 +350,7 @@ install-wx_mac-cgc:
 	$(ICP) -r PLT_MrEd.framework/Versions/$(FWVERSION)/Resources $(MRFWDIR)/Versions/$(FWVERSION)/Resources
 	/usr/bin/install_name_tool -change "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" "@FRAMEWORK_PREFIX@PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app/Contents/MacOS/MrEd@CGC_CAP_INSTALLED@"
 	$(MZSCHEME) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app/Contents/MacOS/MrEd@CGC_CAP_INSTALLED@" ../../../collects
-	/usr/bin/strip -S "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app/Contents/MacOS/MrEd@CGC_CAP_INSTALLED@"
+	@STRIP_DEBUG@ "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app/Contents/MacOS/MrEd@CGC_CAP_INSTALLED@"
 
 install-wx_mac-cgc-final:
 	ln -s Versions/$(FWVERSION)/PLT_MrEd $(MRFWDIR)/
@@ -364,7 +364,7 @@ install-wx_mac-3m:
 	$(ICP) -r "PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources" "$(MRFWDIR)/Versions/$(FWVERSION)_3m/Resources"
 	/usr/bin/install_name_tool -change "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "@FRAMEWORK_PREFIX@PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app/Contents/MacOS/MrEd@MMM_CAP_INSTALLED@"
 	$(MZSCHEME) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app/Contents/MacOS/MrEd@MMM_CAP_INSTALLED@" "../../../collects"
-	/usr/bin/strip -S "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app/Contents/MacOS/MrEd@MMM_CAP_INSTALLED@"
+	@STRIP_DEBUG@ "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app/Contents/MacOS/MrEd@MMM_CAP_INSTALLED@"
 
 install-wx_mac-3m-final:
 	ln -s Versions/$(FWVERSION)_3m/PLT_MrEd $(MRFWDIR)/
diff --git a/src/mzscheme/Makefile.in b/src/mzscheme/Makefile.in
index 4fbb03e68d..4655d9f585 100644
--- a/src/mzscheme/Makefile.in
+++ b/src/mzscheme/Makefile.in
@@ -25,6 +25,8 @@ AR = @AR@
 ARFLAGS = @ARFLAGS@
 RANLIB = @RANLIB@
 
+STRIP_DEBUG = @STRIP_DEBUG@
+
 ARLIBFLAGS = @LDFLAGS@ @LIBS@
 
 MZSRC = $(srcdir)/src
@@ -275,7 +277,7 @@ unix-install:
 	cd ..; rm -f "$(DESTDIR)$(bindir)/mzscheme@CGC_INSTALLED@"
 	cd ..; rm -f "$(DESTDIR)$(bindir)/mzscheme@MMM_INSTALLED@"
 	cd ..; cp mzscheme/starter "$(DESTDIR)$(libpltdir)/starter"
-	-cd ..; strip -S "$(DESTDIR)$(libpltdir)/starter"
+	cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/starter"
 	cd ..; echo 'CC=@CC@' > "$(BUILDINFO)"
 	cd ..; echo 'CFLAGS=@CFLAGS@ @PREFLAGS@ @COMPFLAGS@' >> "$(BUILDINFO)"
 	cd ..; echo 'OPTIONS=@OPTIONS@' >> "$(BUILDINFO)"
@@ -321,7 +323,7 @@ osx-install-cgc:
 	mkdir -p "$(MZFWDIR)/Versions/$(FWVERSION)"
 	cp $(MZFW) $(MZFWDIR)/Versions/$(FWVERSION)/
 	/usr/bin/install_name_tool -change "@executable_path/PLT_MzScheme.framework/Versions/$(FWVERSION)/PLT_MzScheme" "@FRAMEWORK_PREFIX@PLT_MzScheme.framework/Versions/$(FWVERSION)/PLT_MzScheme" "$(bindir)/mzscheme@CGC_INSTALLED@"
-	/usr/bin/strip -S "$(bindir)/mzscheme@CGC_INSTALLED@"
+	$(STRIP_DEBUG) "$(bindir)/mzscheme@CGC_INSTALLED@"
 
 osx-install-cgc-final:
 	$(MAKE) unix-install-cgc-final
@@ -332,7 +334,7 @@ osx-install-3m:
 	mkdir -p "$(MZFWDIR)/Versions/$(FWVERSION)_3m"
 	cp $(MZFWMMM) $(MZFWDIR)/Versions/$(FWVERSION)_3m/
 	/usr/bin/install_name_tool -change "@executable_path/PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "@FRAMEWORK_PREFIX@PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "$(bindir)/mzscheme@MMM_INSTALLED@"
-	/usr/bin/strip -S "$(bindir)/mzscheme@MMM_INSTALLED@"
+	$(STRIP_DEBUG) "$(bindir)/mzscheme@MMM_INSTALLED@"
 
 osx-install-3m-final:
 	$(MAKE) unix-install-3m-final
diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac
index c4983db75e..6236202a05 100644
--- a/src/mzscheme/configure.ac
+++ b/src/mzscheme/configure.ac
@@ -349,6 +349,8 @@ CGC_INSTALLED=cgc
 CGC_CAP_INSTALLED=CGC
 MAIN_VARIANT=3m
 
+STRIP_DEBUG=":"
+
 ###### OSKit stuff #######
 
 if test "${enable_oskit}" = "yes" ; then
@@ -536,6 +538,7 @@ case $OS in
     LIBS="$LIBS -ldl -lm -rdynamic"
     DYN_CFLAGS="-fPIC"
     GC_THREADS_FLAG="-DGC_LINUX_THREADS"
+    STRIP_DEBUG="strip -S"
     # PPC: X11 librares are not found
     case `$UNAME -m` in
       #Required for CentOS 4.6
@@ -607,6 +610,8 @@ case $OS in
     
     PREFLAGS="$PREFLAGS -DOS_X -D_DARWIN_UNLIMITED_SELECT"
 
+    STRIP_DEBUG="/usr/bin/strip -S"
+
     # zlib comes with the OS
     ZLIB_A=""
     ZLIB_INC=""
@@ -1318,6 +1323,7 @@ AC_SUBST(RANLIB)
 AC_SUBST(AR)
 AC_SUBST(STATIC_AR)
 AC_SUBST(ARFLAGS)
+AC_SUBST(STRIP_DEBUG)
 AC_SUBST(WBUILD)
 AC_SUBST(CC_FOR_BUILD)
 AC_SUBST(REZ)