diff --git a/configure b/configure
index eb40f9d6c6..85fd51b6f3 100755
--- a/configure
+++ b/configure
@@ -1069,7 +1069,9 @@ config_h="config-host.h"
 test -f $config_h && mv $config_h ${config_h}~
 
 echo "# Automatically generated by configure - do not modify" > $config_mak
-echo "# Configured with: $0 $@" >> $config_mak
+echo -n "# Configured with:" >> $config_mak
+printf " '%s'" "$0" "$@" >> $config_mak
+echo >> $config_mak
 echo "/* Automatically generated by configure - do not modify */" > $config_h
 
 echo "prefix=$prefix" >> $config_mak