diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 3a7709a8148..7405f44e569 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-10  Hans-Peter Nilsson  <hp@axis.com>
+
+	* test_summary (configflags): Adjust for changes in the
+	config.status format due to update to autoconf 2.59.
+
 2007-02-09  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gcc_update: Update for configure.in -> configure.ac.
diff --git a/contrib/test_summary b/contrib/test_summary
index a959078f1e1..98664359bc2 100755
--- a/contrib/test_summary
+++ b/contrib/test_summary
@@ -103,6 +103,7 @@ BEGIN {
 configflags == "" {
     configflags = $0 " ";
     sub(/^# /, "", configflags);
+    sub(/^s,@TOPLEVEL_CONFIGURE_ARGUMENTS@,/, "", configflags);
     srcdir = configflags;
     sub(/\/configure .*/, "", srcdir);
     printf "LAST_UPDATED: ";
@@ -110,6 +111,7 @@ configflags == "" {
     print "";
 
     sub(/^[^ ]*\/configure */, " ", configflags);
+    sub(/,;t t $/, " ", configflags);
     sub(/ --with-gcc-version-trigger=[^ ]* /, " ", configflags);
     sub(/ --norecursion /, " ", configflags);
     sub(/ $/, "", configflags);