diff --git a/ChangeLog b/ChangeLog
index 45ba4ccaa9..152d3dbfdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-17  Jeff Bailey  <jbailey@outpost.dnsalias.org>
+
+	* aclocal.m4: Use just the bits from AS_INIT that are needed for the
+	GLIBC_PROVIDES.  Use plain comment instead of HEADER-COMMENT so
+	that it's obvious when extra autoconf machinery is being dragged in.
+
 2002-10-18  Roland McGrath  <roland@redhat.com>
 
 	* configure.in: Remove bogus echo included in
diff --git a/aclocal.m4 b/aclocal.m4
index 3fe441285b..d0d037dcad 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,9 +13,11 @@ AC_PROVIDE([AC_PROG_CC])dnl
 AC_PROVIDE([AC_PROG_CPP])dnl
 define([AS_MESSAGE_LOG_FD],5)dnl
 define([AS_MESSAGE_FD],6)dnl
-AS_INIT()dnl
-m4_divert_text([HEADER-COMMENT],
-[@%:@ This file is generated from configure.in by Autoconf.  DO NOT EDIT!])
+dnl Ripped out of AS_INIT, which does more cruft we do not want.
+m4_wrap([m4_divert_pop([BODY])[]])
+m4_divert_push([BODY])[]dnl
+dnl End of ripped out of AS_INIT.
+# This file is generated from configure.in by Autoconf.  DO NOT EDIT!
 define([_AC_LANG], [C])dnl
 ])dnl
 dnl