diff --git a/config.lib b/config.lib
index 0dfafc82b3..4b973fa804 100644
--- a/config.lib
+++ b/config.lib
@@ -257,10 +257,10 @@ save_params() {
 
 	configure="$0 --ignore-extra-parameters"
 	for p in $save_params_array; do
-		eval "v=\$$p"
+		eval "v=\"\$$p\""
 		p=`echo "$p" | sed 's/_/-/g;s/\n//g;'`
 		# Only save those params that aren't empty
-		configure="$configure --$p=$v"
+		configure="$configure --$p=\"$v\""
 	done
 
 	echo "$configure" >> $config_log
diff --git a/configure b/configure
index ecd13e2701..f28be4a465 100755
--- a/configure
+++ b/configure
@@ -25,8 +25,9 @@ if [ "$1" = "--reconfig" ]; then
 		exit 1
 	fi
 	# Make sure we don't lock config.cache
-	configure=`cat config.cache`
-	$configure
+	cat config.cache > cache.tmp
+	sh cache.tmp
+	rm -f cache.tmp
 	exit $?
 fi