diff --git a/ChangeLog b/ChangeLog
index ba9be1c3e..44326d699 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-29  Dr. Werner Fink  <werner@suse.de>
+
+	* configure: Make it possible to handle configure options which
+	have strings containing spaces.
+
+2006-08-27  David Turner  <david@freetype.org>
+
+	<TO BE WRITTEN>
+
 2006-08-27  Jens Claudius  <jens.claudius@yahoo.com>
 
 	Fix miscellaneous compiler warnings.
diff --git a/configure b/configure
index 4921a3074..f251ae417 100644
--- a/configure
+++ b/configure
@@ -91,6 +91,10 @@ fi
 
 # call make
 
-CFG="$@" $GNUMAKE setup unix
+CFG=
+for x in ${1+"$@"}; do
+  CFG="$CFG \"$x\""
+done
+CFG=$CFG $GNUMAKE setup unix
 
 # eof