diff --git a/ChangeLog b/ChangeLog
index eedccf40d9..3a5e778913 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-21  Richard Sandiford  <richard@codesourcery.com>
+
+	* configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS): Fix m4 quoting
+	of glob.  Quote arguments with single quotes too.
+	* configure: Regenerate.
+
 2007-03-12  Brooks Moses  <brooks.moses@codesourcery.com>
 
 	* Makefile.def (fixincludes): Remove unneeded "missing" lines.
diff --git a/configure b/configure
index 0554463a23..6e989c29a5 100755
--- a/configure
+++ b/configure
@@ -1768,7 +1768,7 @@ set -- "$progname" "$@"
 for ac_arg
 do
   case "$ac_arg" in
-  *" "*|*"	"*|*\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?*)
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\']*)
     ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
     # if the argument is of the form -foo=baz, quote the baz part only
     ac_arg=`echo "'$ac_arg'" | sed "s/^'\([-a-zA-Z0-9]*=\)/\\1'/"` ;;
diff --git a/configure.ac b/configure.ac
index 16ff8d3ddf..9c38fadfd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ set -- "$progname" "$@"
 for ac_arg
 do
   case "$ac_arg" in
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  *" "*|*"	"*|*[[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\']]*)
     ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
     # if the argument is of the form -foo=baz, quote the baz part only
     ac_arg=`echo "'$ac_arg'" | sed "s/^'\([[-a-zA-Z0-9]]*=\)/\\1'/"` ;;