diff --git a/auto/configure b/auto/configure
index fa52ad9..333b162 100755
--- a/auto/configure
+++ b/auto/configure
@@ -3,8 +3,6 @@
 # Copyright (C) Igor Sysoev
 
 
-NGX_CONFIGURE=`echo $@ | sed 's/"/\\\\"/g'`
-
 . auto/options
 . auto/init
 . auto/sources
diff --git a/auto/options b/auto/options
index 8ec692e..0901fcd 100644
--- a/auto/options
+++ b/auto/options
@@ -129,9 +129,12 @@
 
 NGX_CPU_CACHE_LINE=
 
+opt=
 
 for option
 do
+     opt="$opt `echo $option | sed -e \"s/\(--[^=]*=\)\(.* .*\)/\1'\2'/\"`"
+
     case "$option" in
         -*=*) value=`echo "$option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;;
            *) value="" ;;
@@ -267,6 +270,9 @@
 done
 
 
+NGX_CONFIGURE="$opt"
+
+
 if [ $help = yes ]; then
 
 cat << END
diff --git a/src/core/nginx.c b/src/core/nginx.c
index f08af79..bf2f38d 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -232,7 +232,7 @@
 #ifdef NGX_COMPILER
             ngx_log_stderr(0, "built by " NGX_COMPILER);
 #endif
-            ngx_log_stderr(0, "configure arguments: " NGX_CONFIGURE);
+            ngx_log_stderr(0, "configure arguments:" NGX_CONFIGURE);
         }
 
         if (!ngx_test_config) {