diff --git a/config.lib b/config.lib
index f3d0b67094..5eb89396e2 100644
--- a/config.lib
+++ b/config.lib
@@ -275,7 +275,7 @@ save_params() {
 	echo "Running configure with following options:" >> $config_log
 	echo "" >> $config_log
 
-	configure="$0 --ignore-extra-parameters"
+	configure="$CONFIGURE_EXECUTABLE --ignore-extra-parameters"
 	for p in $save_params_array; do
 		eval "v=\"\$$p\""
 		p=`echo "$p" | sed 's/_/-/g;s/\n//g;'`
diff --git a/configure b/configure
index 51a5c440e1..e61b972dc3 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+CONFIGURE_EXECUTABLE="$_"
+# On *nix systems those two are equal when ./configure is done
+if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
+	CONFIGURE_EXECUTABLE="$CONFIGURE_EXECUTABLE $0"
+fi
 # Find out where configure is (in what dir)
 ROOT_DIR="`dirname $0`"
 ROOT_DIR="`cd $ROOT_DIR && pwd`"