diff --git a/mps/configure b/mps/configure
index 97c91078552..4aabf21ff92 100755
--- a/mps/configure
+++ b/mps/configure
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for Memory Pool System master.
 #
-# Report bugs to <mps-discussion@ravenbrook.com>.
+# Report bugs to <mps-questions@ravenbrook.com>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -266,7 +266,7 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: mps-discussion@ravenbrook.com about your system,
+$0: mps-questions@ravenbrook.com about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -581,12 +581,13 @@ PACKAGE_NAME='Memory Pool System'
 PACKAGE_TARNAME='memory-pool-system'
 PACKAGE_VERSION='master'
 PACKAGE_STRING='Memory Pool System master'
-PACKAGE_BUGREPORT='mps-discussion@ravenbrook.com'
+PACKAGE_BUGREPORT='mps-questions@ravenbrook.com'
 PACKAGE_URL=''
 
 ac_unique_file="code/mps.c"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+MPS_TARGET_NAME
 MPS_TARGET_PF
 host_os
 host_vendor
@@ -1275,7 +1276,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <mps-discussion@ravenbrook.com>.
+Report bugs to <mps-questions@ravenbrook.com>.
 _ACEOF
 ac_status=$?
 fi
@@ -2640,38 +2641,47 @@ case $host in
   i*86-*-linux*)
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux x86" >&5
 $as_echo "Linux x86" >&6; }
-      MPS_TARGET_PF=MPS_PF_LII4GC
+      MPS_TARGET_PF=MPS_PF_LI3C
+      MPS_TARGET_NAME=lii3gc
     ;;
   x86_64-*-linux*)
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux x86_64" >&5
 $as_echo "Linux x86_64" >&6; }
       MPS_TARGET_PF=MPS_PF_LII6GC
+      MPS_TARGET_NAME=lii6gc
     ;;
   i*86-*-darwin*)
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: Mac OS X x86" >&5
 $as_echo "Mac OS X x86" >&6; }
       MPS_TARGET_PF=MPS_PF_XCI3LL
+      BUILD_TARGET=build-via-xcode
+      CLEAN_TARGET=clean-xcode-build
     ;;
   x86_64-apple-darwin*)
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: Mac OS X x86_64" >&5
 $as_echo "Mac OS X x86_64" >&6; }
       MPS_TARGET_PF=MPS_PF_XCI6LL
+      BUILD_TARGET=build-via-xcode
+      CLEAN_TARGET=clean-xcode-build
     ;;
   i*86-*-freebsd*)
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeBSD x86" >&5
 $as_echo "FreeBSD x86" >&6; }
-      MPS_TARGET_PF=MPS_PF_FRI4GC
+      MPS_TARGET_PF=MPS_PF_FRI3GC
+      MPS_TARGET_NAME=fri3gc
     ;;
   amd64-*-freebsd*)
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeBSD x86_64" >&5
 $as_echo "FreeBSD x86_64" >&6; }
       MPS_TARGET_PF=MPS_PF_FRI6GC
+      MPS_TARGET_NAME=fri6gc
     ;;
   *)
     as_fn_error $? "MPS does not yet support this platform." "$LINENO" 5
 esac
 
 
+
 ac_config_files="$ac_config_files Makefile"
 
 
@@ -3264,7 +3274,7 @@ Usage: $0 [OPTION]... [TAG]...
 Configuration files:
 $config_files
 
-Report bugs to <mps-discussion@ravenbrook.com>."
+Report bugs to <mps-questions@ravenbrook.com>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1