diff --git a/src/configure b/src/configure
index 73d4f65474..5f664178ef 100755
--- a/src/configure
+++ b/src/configure
@@ -733,7 +733,6 @@ FOREIGN_CONVENIENCE
 FOREIGNTARGET
 LIBMZSCHEME_DEP
 LIBMRED_DEP
-LLVMTARGET
 LTO
 LTA
 collectsdir
@@ -766,7 +765,6 @@ CCC
 CXXCPP
 XMKMF'
 ac_subdirs_all='foreign/gcc/libffi
-llvm/llvm
 wxcommon/jpeg
 wxxt/src/x/wbuild '
 
@@ -1345,7 +1343,6 @@ Optional Features:
   --enable-lt=<prog>      use <prog> instead of bundled libtool
   --enable-origtree       install with original directory structure
   --enable-foreign        compile foreign support (enabled by default)
-  --enable-llvm           compile llvm support (disabled by default)
   --enable-cgcdefault     use CGC (Boehm or Senora) as default build
   --enable-sgc            use Senora GC instead of the Boehm GC
   --enable-sgcdebug       use Senora GC for debugging
@@ -1883,13 +1880,6 @@ else
   enable_foreign=yes
 fi
 
-# Check whether --enable-llvm was given.
-if test "${enable_llvm+set}" = set; then
-  enableval=$enable_llvm;
-else
-  enable_llvm=no
-fi
-
 
 # Check whether --enable-cgcdefault was given.
 if test "${enable_cgcdefault+set}" = set; then
@@ -2207,7 +2197,6 @@ fi
 show_explicitly_enabled "${enable_orig}" "Original install tree"
 
 show_explicitly_disabled "${enable_foreign}" Foreign
-show_explicitly_enabled "${enable_llvm}" LLVM
 
 show_explicitly_enabled "${enable_sgc}" SGC
 show_explicitly_enabled "${enable_sgcdebug}" "SGC debug mode"
@@ -11783,8 +11772,6 @@ LIBS="$LIBS $EXTRALIBS"
 
 
 
-
-
 
 
 
@@ -11856,21 +11843,6 @@ else
   MZOPTIONS="$MZOPTIONS -DDONT_USE_FOREIGN"
 fi
 
-LLVMTARGET=
-if test -d "${srcdir}/llvm" && test "${enable_llvm}" = "yes" ; then
-  subdirs="$subdirs llvm/llvm"
-
-  makefiles="$makefiles llvm/Makefile"
-  LLVMTARGET="llvm-stuff"
-  # Again, this changes arguments that are passed to *all* sub-configure
-  # invocations, which might be a problem.  Hopefully nobody else uses
-  # "--enable-targets" and if someone else uses "--enable-optimized" we might
-  # as well just go with it...
-  ac_configure_args="$ac_configure_args --enable-optimized --enable-targets=host-only"
-else
-  LLVMTARGET="llvm-nothing"
-fi
-
 if test "${enable_mred}" = "yes" ; then
   if test "${enable_quartz}" = "yes" ; then
     mk_needed_dir wxmac
@@ -12749,7 +12721,6 @@ FOREIGN_CONVENIENCE!$FOREIGN_CONVENIENCE$ac_delim
 FOREIGNTARGET!$FOREIGNTARGET$ac_delim
 LIBMZSCHEME_DEP!$LIBMZSCHEME_DEP$ac_delim
 LIBMRED_DEP!$LIBMRED_DEP$ac_delim
-LLVMTARGET!$LLVMTARGET$ac_delim
 LTO!$LTO$ac_delim
 LTA!$LTA$ac_delim
 collectsdir!$collectsdir$ac_delim
@@ -12768,7 +12739,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` = 38; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/src/mzscheme/Makefile.in b/src/mzscheme/Makefile.in
index bace3fe9e8..2c8bc6857c 100644
--- a/src/mzscheme/Makefile.in
+++ b/src/mzscheme/Makefile.in
@@ -36,8 +36,6 @@ FOREIGN_OBJSLIB = @FOREIGN_OBJSLIB@
 # The foreign build always uses libtool, so that's why we use .la instead of @LTA@
 #  in FOREIGN_LIB.
 
-LLVM_DIR = ../llvm
-
 # About EXE_SUFFIX:
 #  Cygwin offers the illusion that binaries have no ".exe" suffix by
 #  having the file-open syscall open an ".exe" file for reading when
@@ -57,7 +55,6 @@ normal-bin:
 common:
 	$(MAKE) g-c
 	$(MAKE) @FOREIGNTARGET@
-	$(MAKE) @LLVMTARGET@
 
 cgc:
 	$(MAKE) common
@@ -114,13 +111,6 @@ foreign-stuff:
 foreign-nothing:
 	echo no foreign
 
-# llvm
-llvm-stuff:
-	cd $(LLVM_DIR); $(MAKE) all
-
-llvm-nothing:
-	echo no llvm
-
 mzlibrary:
 	cd src; $(MAKE) all 
 	$(MAKE) libmzscheme.@LIBSFX@
@@ -227,7 +217,6 @@ clean@NOT_OSX@:
 	cd src; $(MAKE) clean
 	cd dynsrc; $(MAKE) clean
 	if [ -d ../foreign ] ; then cd ../foreign ; $(MAKE) clean ; fi
-	if [ -d ../llvm    ] ; then cd ../llvm    ; $(MAKE) clean ; fi
 
 clean@OSX@:
 	rm -rf PLT_MzScheme.framework
diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac
index e4352024fc..70eca5e03d 100644
--- a/src/mzscheme/configure.ac
+++ b/src/mzscheme/configure.ac
@@ -40,7 +40,6 @@ AC_ARG_ENABLE(lt,      [  --enable-lt=<prog>      use <prog> instead of bundled
 AC_ARG_ENABLE(origtree,[  --enable-origtree       install with original directory structure])
 
 AC_ARG_ENABLE(foreign, [  --enable-foreign        compile foreign support (enabled by default)], , enable_foreign=yes)
-AC_ARG_ENABLE(llvm,    [  --enable-llvm           compile llvm support (disabled by default)], , enable_llvm=no)
 
 AC_ARG_ENABLE(cgcdefault, [  --enable-cgcdefault     use CGC (Boehm or Senora) as default build])
 AC_ARG_ENABLE(sgc,     [  --enable-sgc            use Senora GC instead of the Boehm GC])
@@ -272,7 +271,6 @@ fi
 show_explicitly_enabled "${enable_orig}" "Original install tree"
 
 show_explicitly_disabled "${enable_foreign}" Foreign
-show_explicitly_enabled "${enable_llvm}" LLVM
 
 show_explicitly_enabled "${enable_sgc}" SGC
 show_explicitly_enabled "${enable_sgcdebug}" "SGC debug mode"
@@ -1332,8 +1330,6 @@ AC_SUBST(FOREIGNTARGET)
 AC_SUBST(LIBMZSCHEME_DEP)
 AC_SUBST(LIBMRED_DEP)
 
-AC_SUBST(LLVMTARGET)
-
 AC_SUBST(LTO)
 AC_SUBST(LTA)
 
@@ -1388,20 +1384,6 @@ else
   MZOPTIONS="$MZOPTIONS -DDONT_USE_FOREIGN"
 fi
 
-LLVMTARGET=
-if test -d "${srcdir}/llvm" && test "${enable_llvm}" = "yes" ; then
-  AC_CONFIG_SUBDIRS( llvm/llvm )
-  makefiles="$makefiles llvm/Makefile"
-  LLVMTARGET="llvm-stuff"
-  # Again, this changes arguments that are passed to *all* sub-configure
-  # invocations, which might be a problem.  Hopefully nobody else uses
-  # "--enable-targets" and if someone else uses "--enable-optimized" we might
-  # as well just go with it...
-  ac_configure_args="$ac_configure_args --enable-optimized --enable-targets=host-only"
-else
-  LLVMTARGET="llvm-nothing"
-fi
-
 if test "${enable_mred}" = "yes" ; then
   if test "${enable_quartz}" = "yes" ; then
     mk_needed_dir wxmac