diff --git a/Makefile b/Makefile
index d43de32ad5..e4a8af6a4c 100644
--- a/Makefile
+++ b/Makefile
@@ -178,6 +178,7 @@ clean: $(CLEANVHOOK)
 clean-vhook:
 	$(MAKE) -C vhook clean
 
+# Note well: config.log is NOT removed.
 distclean: clean
 	$(MAKE) -C libavcodec distclean
 	rm -f config.mak config.h
diff --git a/configure b/configure
index a9c3ae170a..c76695b39f 100755
--- a/configure
+++ b/configure
@@ -347,6 +347,11 @@ if test -z "$source_path" -o "$source_path" = "." ; then
     source_path_used="no"
 fi
 
+FFMPEG_CONFIGURATION=" "
+for opt do
+  FFMPEG_CONFIGURATION="$FFMPEG_CONFIGURATION""$opt "
+done
+
 for opt do
   case "$opt" in
   --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
@@ -1044,8 +1049,11 @@ fi
 
 echo "Creating config.mak and config.h"
 
+date >> config.log
+echo "   $0 $FFMPEG_CONFIGURATION" >> config.log
 echo "# Automatically generated by configure - do not modify" > config.mak
 echo "/* Automatically generated by configure - do not modify */" > $TMPH
+echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
 
 echo "prefix=$prefix" >> config.mak
 echo "bindir=$bindir" >> config.mak
diff --git a/ffmpeg.c b/ffmpeg.c
index 103269877b..4178d0a1d9 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3890,6 +3890,7 @@ static void show_banner(void)
 {
     printf("ffmpeg version " FFMPEG_VERSION ", build %d, Copyright (c) 2000-2004 Fabrice Bellard\n",
         LIBAVCODEC_BUILD);
+    printf("  configuration: %s\n", FFMPEG_CONFIGURATION);
     printf("  built on " __DATE__ " " __TIME__);
 #ifdef __GNUC__
     printf(", gcc: %s\n", __VERSION__);