diff --git a/ChangeLog b/ChangeLog
index 93c3c333725..f1b134aa8f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-10  Glenn Morris  <rgm@gnu.org>
+
+	* configure.ac (emacs_config_options): Strip out the (internal)
+	arguments --no-create and --no-recursion.
+
 2013-02-08  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Merge from gnulib, incorporating:
diff --git a/configure.ac b/configure.ac
index e122e4c18ad..5991f2d9e93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4087,7 +4087,7 @@ fi
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "${canonical}",
 		   [Define to the canonical Emacs configuration name.])
 dnl Replace any embedded " characters (bug#13274).
-emacs_config_options=`echo "$emacs_config_options" | sed -e "s/\"/'/g"`
+emacs_config_options=`echo "$emacs_config_options " | sed -e 's/--no-create //' -e 's/--no-recursion //' -e 's/ *$//' -e "s/\"/'/g"`
 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${emacs_config_options}",
 		   [Define to the options passed to configure.])
 AH_TEMPLATE(config_opsysfile, [Some platforms that do not use configure