diff --git a/src/configure b/src/configure
index 35eb49225a..02106880ef 100755
--- a/src/configure
+++ b/src/configure
@@ -1324,6 +1324,7 @@ Optional Features:
   --enable-gracket        compile GRacket as well as Racket (enabled by default)
   --enable-plot           compile plot libraries (enabled by default)
   --enable-docs           build docs on install (enabled by default)
+  --enable-usersetup      setup user-specific files on install
   --enable-shared         create shared libraries
   --enable-dynlib         same as --enable-shared
   --enable-lt=<prog>      use <prog> instead of bundled libtool
@@ -1820,6 +1821,11 @@ else
   enable_docs=yes
 fi
 
+# Check whether --enable-usersetup was given.
+if test "${enable_usersetup+set}" = set; then
+  enableval=$enable_usersetup;
+fi
+
 # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval=$enable_shared;
@@ -2192,6 +2198,7 @@ show_explicitly_enabled()
 show_explicitly_enabled "${enable_cgcdefault}" "CGC as default"
 
 show_explicitly_disabled "${enable_docs}" "Documentation build"
+show_explicitly_enabled "${enable_usersetup}" "User-specific setup on install"
 
 show_explicitly_enabled "${enable_xonx}" "Unix style"
 show_explicitly_enabled "${enable_shared}" "Shared libraries"
@@ -9647,10 +9654,16 @@ if test "${enable_jit}" = "no" ; then
    PREFLAGS="${PREFLAGS} -DMZ_DONT_USE_JIT"
 fi
 
+############## usersetup ################
+
+if test "${enable_usersetup}" != "yes" ; then
+  INSTALL_SETUP_FLAGS="${INSTALL_SETUP_FLAGS} --no-user"
+fi
+
 ############## docs ################
 
 if test "${enable_docs}" = "no" ; then
-  INSTALL_SETUP_FLAGS="${INSTALL_SETUP_FLAGS} -D"
+  INSTALL_SETUP_FLAGS="${INSTALL_SETUP_FLAGS} --no-docs"
 fi
 
 ############## libtool ################
diff --git a/src/racket/configure.ac b/src/racket/configure.ac
index cc01979989..8b5b0978cc 100644
--- a/src/racket/configure.ac
+++ b/src/racket/configure.ac
@@ -26,6 +26,7 @@ AC_CONFIG_HEADERS([racket/mzconfig.h])
 AC_ARG_ENABLE(gracket, [  --enable-gracket        compile GRacket as well as Racket (enabled by default)], , enable_gracket=yes )
 AC_ARG_ENABLE(plot,    [  --enable-plot           compile plot libraries (enabled by default)], , enable_plot=yes )
 AC_ARG_ENABLE(docs,    [  --enable-docs           build docs on install (enabled by default)], , enable_docs=yes)
+AC_ARG_ENABLE(usersetup, [  --enable-usersetup      setup user-specific files on install])
 AC_ARG_ENABLE(shared,  [  --enable-shared         create shared libraries])
 AC_ARG_ENABLE(dynlib,  [  --enable-dynlib         same as --enable-shared])
 AC_ARG_ENABLE(lt,      [  --enable-lt=<prog>      use <prog> instead of bundled libtool], LIBTOOLPROG="$enableval", enable_lt=no)
@@ -262,6 +263,7 @@ show_explicitly_enabled()
 show_explicitly_enabled "${enable_cgcdefault}" "CGC as default"
 
 show_explicitly_disabled "${enable_docs}" "Documentation build"
+show_explicitly_enabled "${enable_usersetup}" "User-specific setup on install"
 
 show_explicitly_enabled "${enable_xonx}" "Unix style"
 show_explicitly_enabled "${enable_shared}" "Shared libraries"
@@ -1033,10 +1035,16 @@ if test "${enable_jit}" = "no" ; then
    PREFLAGS="${PREFLAGS} -DMZ_DONT_USE_JIT"
 fi
 
+############## usersetup ################
+
+if test "${enable_usersetup}" != "yes" ; then  
+  INSTALL_SETUP_FLAGS="${INSTALL_SETUP_FLAGS} --no-user"
+fi
+
 ############## docs ################
 
 if test "${enable_docs}" = "no" ; then  
-  INSTALL_SETUP_FLAGS="${INSTALL_SETUP_FLAGS} -D"
+  INSTALL_SETUP_FLAGS="${INSTALL_SETUP_FLAGS} --no-docs"
 fi
 
 ############## libtool ################