diff --git a/ChangeLog b/ChangeLog
index 5ca29ed..3d9ba44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-08-27  Akim Demaille  <address@hidden>
 
+	* bin/autoheader.in: Issue the "Using auxiliary..." message only
+	when -Wobsolete is set.
+	Set it on by default.
+	Suggested by Klee Dienes.
+
+2003-08-27  Akim Demaille  <address@hidden>
+
 	* doc/autoconf.texi (AC_FUNC_FSEEKO, AC_SYS_LARGEFILE): More
 	documentation.
 	From Guido Draheim.
diff --git a/NEWS b/NEWS
index ca44b27..1bc0160 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,11 @@
   This became a significant problem since aclocal and automake can
   run autoconf behind the scene.
 
+** autoheader warnings
+  The warnings of autoheader can be turned off, using --warning.
+  For instance, -Wno-obsolete disables the complaints about acconfig.h
+  and other deprecated constructs.
+
 * Major changes in Autoconf 2.57a
 
   Released 2003-06-20 by Akim Demaille.
diff --git a/bin/autoheader.in b/bin/autoheader.in
index caafa27..46faefe 100644
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -126,6 +126,7 @@ sub parse_args ()
 ## -------------- ##
 
 mktmpdir ('ah');
+switch_warning 'obsolete';
 parse_args;
 
 # Preach.
@@ -146,14 +147,14 @@ if ($config_h_top || $config_h_bot || $acconfig_h)
     \`AC_DEFINE_UNQUOTED\' allows to define a template without
     \`acconfig.h\':
 
-      AC_DEFINE([NEED_MAIN], 1,
+      AC_DEFINE([NEED_FUNC_MAIN], 1,
 		[Define if a function \`main\' is needed.])
 
     More sophisticated templates can also be produced, see the
     documentation.
 END
     $msg =~ s/^    /WARNING: /gm;
-    print STDERR $msg;
+    msg 'obsolete', $msg;
   }
 
 # Set up autoconf.
@@ -265,10 +266,10 @@ $out->close;
     }
   foreach (sort keys %symbol)
     {
-      print STDERR "$me: missing template: $_\n";
+      msg 'syntax', "warning: missing template: $_";
       if ($suggest_ac_define)
 	{
-	  print STDERR "Use AC_DEFINE([$_], [], [Description])\n";
+	  msg 'syntax',  "Use AC_DEFINE([$_], [], [Description])";
 	  $suggest_ac_define = 0;
 	}
 
diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index e7eb8f8..f2fea3d 100644
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -172,9 +172,9 @@ my (%ac_macros, %au_macros);
 sub handle_autoconf_macros ()
 {
   my $macros = new Autom4te::XFile ("$autoconf"
-			     . " --trace AU_DEFUN:'AU:\$f:\$1'"
-			     . " --trace define:'AC:\$f:\$1'"
-			     . " --melt /dev/null |");
+				    . " --trace AU_DEFUN:'AU:\$f:\$1'"
+				    . " --trace define:'AC:\$f:\$1'"
+				    . " --melt /dev/null |");
   while ($_ = $macros->getline)
     {
       chomp;