diff --git a/CHANGES b/CHANGES
index 44d7618618f52141e500a42248b0f09de9d9a4a1..e56154cb43ed5fb77c6275c1023454f04fb8151b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Claes Jakobsson (14 Nov 2009)
+- curl-config now accepts '--configure' to see what arguments was
+  passed to the configure script when building curl.
 
 Daniel Stenberg (14 Nov 2009)
 - Claes Jakobsson restored the configure functionality to detect NSS when
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4165591b5159f5572a8f4b515d9bc61aa7bf0913..851e68cc47789e6cb59ecbee8a209160125a5c8f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -10,6 +10,7 @@ Curl and libcurl 7.19.8
 This release includes the following changes:
 
  o support SSL_FILETYPE_ENGINE for client certificate
+ o curl-config can now show the arguments used when building curl
 
 This release includes the following bugfixes:
 
diff --git a/configure.ac b/configure.ac
index bc7e0e4bd8ffb28e92f1d86fcfa06d7347a380c1..b23bc78a0117ab0baf37f0205eeac85824435951 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,12 @@ CURL_CHECK_OPTION_CURLDEBUG
 
 CURL_CHECK_PATH_SEPARATOR_REQUIRED
 
+#
+# save the configure arguments
+#
+CONFIGURE_OPTIONS="\"$ac_configure_args\""
+AC_SUBST(CONFIGURE_OPTIONS)
+
 dnl SED is mandatory for configure process and libtool.
 dnl Set it now, allowing it to be changed later.
 AC_PATH_PROG([SED], [sed], [not_found],
diff --git a/curl-config.in b/curl-config.in
index cbe316e56e7d91f02b0863392a689a7e21f0eb4c..177b6354dcc3f5c4e344d6d547fd2505f1e07698 100644
--- a/curl-config.in
+++ b/curl-config.in
@@ -37,6 +37,7 @@ Available values for OPTION include:
   --cc        compiler
   --cflags    pre-processor and compiler flags
   --checkfor [version] check for (lib)curl of the specified version
+  --configure the arguments given to configure when building curl
   --features  newline separated list of enabled features
   --help      display this help and exit
   --libs      library linking information
@@ -146,6 +147,10 @@ while test $# -gt 0; do
 	echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
 	;;
 
+    --configure)
+      echo @CONFIGURE_OPTIONS@
+    ;;
+
     *)
         echo "unknown option: $1"
 	usage 1
diff --git a/docs/curl-config.1 b/docs/curl-config.1
index a116e6ea408993fda49ba9e3b5b060beb389c4e1..b3bd3832b7101e119da0e1ee8068db1262acbce1 100644
--- a/docs/curl-config.1
+++ b/docs/curl-config.1
@@ -42,6 +42,8 @@ Specify the oldest possible libcurl version string you want, and this
 script will return 0 if the current installation is new enough or it 
 returns 1 and outputs a text saying that the current version is not new 
 enough. (Added in 7.15.4)
+.IP "--configure"
+Displays the arguments given to configure when building curl.
 .IP "--feature"
 Lists what particular main features the installed libcurl was built with. At
 the time of writing, this list may include SSL, KRB4 or IPv6. Do not assume