diff --git a/ChangeLog b/ChangeLog
index 40ddd0d9..e497cbc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-19  Akim Demaille  <akim@epita.fr>
+
+	* acgeneral.m4 (AC_MSG_WARN): s/warning/WARNING/.
+	* autoheader.sh: Likewise.
+	From François Pinard.
+
 2000-05-19  Akim Demaille  <akim@epita.fr>
 
 	* acgeneral.m4 (AC_PACKAGE): Rename as _AC_INIT_PACKAGE.
diff --git a/acgeneral.m4 b/acgeneral.m4
index 5ad6b75a..491804fc 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2289,7 +2289,7 @@ AU_DEFUN([AC_VERBOSE],
 # AC_MSG_WARN(PROBLEM)
 # --------------------
 define([AC_MSG_WARN],
-[_AC_ECHO([configure: warning: $1], 2)])
+[_AC_ECHO([configure: WARNING: $1], 2)])
 
 
 # AC_MSG_ERROR(ERROR, [EXIT-STATUS = 1])
diff --git a/autoheader.in b/autoheader.in
index e068e660..1c05ccdc 100644
--- a/autoheader.in
+++ b/autoheader.in
@@ -167,7 +167,7 @@ if ($warning_all || $warning_obsolete) &&
     (test -f $config_h.top ||
      test -f $config_h.bot ||
      test -f $localdir/acconfig.h); then
-  sed -e "s/^    //;s/^/$me: warning: /" >&2 <<\EOF
+  sed -e "s/^    //;s/^/$me: WARNING: /" >&2 <<\EOF
     Using auxiliary files such as `acconfig.h', `config.h.bot'
     and `config.h.top', to define templates for `config.h.in'
     is deprecated and discouraged.
diff --git a/autoheader.sh b/autoheader.sh
index e068e660..1c05ccdc 100644
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -167,7 +167,7 @@ if ($warning_all || $warning_obsolete) &&
     (test -f $config_h.top ||
      test -f $config_h.bot ||
      test -f $localdir/acconfig.h); then
-  sed -e "s/^    //;s/^/$me: warning: /" >&2 <<\EOF
+  sed -e "s/^    //;s/^/$me: WARNING: /" >&2 <<\EOF
     Using auxiliary files such as `acconfig.h', `config.h.bot'
     and `config.h.top', to define templates for `config.h.in'
     is deprecated and discouraged.
diff --git a/bin/autoheader.in b/bin/autoheader.in
index e068e660..1c05ccdc 100644
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -167,7 +167,7 @@ if ($warning_all || $warning_obsolete) &&
     (test -f $config_h.top ||
      test -f $config_h.bot ||
      test -f $localdir/acconfig.h); then
-  sed -e "s/^    //;s/^/$me: warning: /" >&2 <<\EOF
+  sed -e "s/^    //;s/^/$me: WARNING: /" >&2 <<\EOF
     Using auxiliary files such as `acconfig.h', `config.h.bot'
     and `config.h.top', to define templates for `config.h.in'
     is deprecated and discouraged.
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 5ad6b75a..491804fc 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2289,7 +2289,7 @@ AU_DEFUN([AC_VERBOSE],
 # AC_MSG_WARN(PROBLEM)
 # --------------------
 define([AC_MSG_WARN],
-[_AC_ECHO([configure: warning: $1], 2)])
+[_AC_ECHO([configure: WARNING: $1], 2)])
 
 
 # AC_MSG_ERROR(ERROR, [EXIT-STATUS = 1])