diff --git a/ChangeLog b/ChangeLog
index 70186975..014f35b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-31  Akim Demaille  <akim@epita.fr>
+
+	* autoconf.sh (Looking for bugs): In addition to AC_, match AH_
+	and AM_.
+
 1999-10-31  Akim Demaille  <akim@epita.fr>
 
 	Provide the m4 infrastructure for defining AH_ hooks.
diff --git a/autoconf.in b/autoconf.in
index afea20b2..c7ce4ba3 100644
--- a/autoconf.in
+++ b/autoconf.in
@@ -137,7 +137,7 @@ $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
 # You could add your own prefixes to pattern if you wanted to check for
 # them too, e.g. pattern='\(AC_\|ILT_\)', except that UNIX sed doesn't do
 # alternation.
-pattern="AC_"
+pattern="A[CHM]_"
 
 status=0
 if grep "^[^#]*${pattern}" $tmpout > /dev/null 2>&1; then
diff --git a/autoconf.sh b/autoconf.sh
index afea20b2..c7ce4ba3 100644
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -137,7 +137,7 @@ $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
 # You could add your own prefixes to pattern if you wanted to check for
 # them too, e.g. pattern='\(AC_\|ILT_\)', except that UNIX sed doesn't do
 # alternation.
-pattern="AC_"
+pattern="A[CHM]_"
 
 status=0
 if grep "^[^#]*${pattern}" $tmpout > /dev/null 2>&1; then
diff --git a/bin/autoconf.in b/bin/autoconf.in
index afea20b2..c7ce4ba3 100644
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -137,7 +137,7 @@ $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
 # You could add your own prefixes to pattern if you wanted to check for
 # them too, e.g. pattern='\(AC_\|ILT_\)', except that UNIX sed doesn't do
 # alternation.
-pattern="AC_"
+pattern="A[CHM]_"
 
 status=0
 if grep "^[^#]*${pattern}" $tmpout > /dev/null 2>&1; then