diff --git a/ChangeLog b/ChangeLog
index ed7894a7..19660efa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-25  Akim Demaille  <akim@epita.fr>
+
+	* lib/autotest/general.m4 (AT_INIT): Dump the whole config.log.
+	Be sure the close and reopen the LOG fd before and after using tee
+	to extend the log.
+	<at_tests_pattern>: Adjust to the new format of at_help_all.
+
 2001-09-23  Akim Demaille  <akim@epita.fr>
 
 	* bin/autom4te.in (parse_args): There can be several invocations
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index a2be7f63..463774b8 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -257,9 +257,9 @@ Options:
 Tests:
 _ATEOF
   else
-    # "  1 42  45 " => " (1|42|45): "
+    # "  1 42  45 " => "^(1|42|45);"
     at_tests_pattern=`echo "$at_tests" | sed 's/^  *//;s/  *$//;s/  */|/g'`
-    at_tests_pattern=" (${at_tests_pattern}): "
+    at_tests_pattern="^(${at_tests_pattern});"
   fi
   case $at_help in
   short)
@@ -555,7 +555,9 @@ elif test $at_debug = false; then
     echo
   } >&AS_MESSAGE_LOG_FD
 
+  exec AS_MESSAGE_LOG_FD>/dev/null
   $SHELL $[0] -v -d $at_debug_args $at_fail_list 2>&1 | tee -a $as_me.log
+  exec AS_MESSAGE_LOG_FD>>$as_me.log
 
   {
     echo
@@ -565,7 +567,7 @@ elif test $at_debug = false; then
       for at_file in `find "$top_srcdir" -name config.log -print`
       do
   	echo "$as_me: $at_file:"
-  	sed 's/^/| /;10q' $at_file
+  	sed 's/^/| /' $at_file
   	echo
       done
     fi