diff --git a/ChangeLog b/ChangeLog
index ac3c1d18..00264ac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-12  Akim Demaille  <akim@epita.fr>
+
+	* lib/autotest/general.m4 (AT_INIT): Push KILL at the end.
+	Now that M4sh pushes BODY, the comments were output at the end of
+	the test suites.
+
 2001-11-08  Akim Demaille  <akim@epita.fr>
 
 	* bin/autoreconf.in (&autoreconf): Run aclocal before tracing, so
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index e915ddb8..0f46c53c 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -629,6 +629,11 @@ fi
 
 exit 0
 m4_divert_pop([TAIL])dnl
+dnl End of AT_INIT: divert to KILL, only test groups are to be
+dnl output, the rest is ignored.  Current diversion is BODY, inherited
+dnl from M4sh.
+m4_divert_push([KILL])
+m4_wrap([m4_divert_pop([KILL])[]])
 ])# AT_INIT