diff --git a/admin/Makefile.am b/admin/Makefile.am
index 382d6c067..46aab6594 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-AUTOHEADER_FLAGS = no-dependencies
+AUTOMAKE_OPTIONS = no-dependencies foreign
 
 INCLUDES = -I$(top_builddir)/include $(INCLUDE_readline)
 
diff --git a/appl/rsh/Makefile.am b/appl/rsh/Makefile.am
index 1dea300bc..6fb045da4 100644
--- a/appl/rsh/Makefile.am
+++ b/appl/rsh/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-AUTOHEADER_FLAGS = no-dependencies foreign
+AUTOMAKE_OPTIONS = no-dependencies foreign
 
 INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4)
 
diff --git a/appl/telnet/Makefile.am b/appl/telnet/Makefile.am
index b371319f4..42b5647a8 100644
--- a/appl/telnet/Makefile.am
+++ b/appl/telnet/Makefile.am
@@ -1,5 +1,5 @@
 # $Id$
 
-AUTOHEADER_FLAGS = no-dependencies foreign
+AUTOMAKE_OPTIONS = no-dependencies foreign
 
 SUBDIRS = libtelnet telnet telnetd
diff --git a/appl/telnet/libtelnet/Makefile.am b/appl/telnet/libtelnet/Makefile.am
index f786669ec..e8311fda6 100644
--- a/appl/telnet/libtelnet/Makefile.am
+++ b/appl/telnet/libtelnet/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-AUTOHEADER_FLAGS = no-dependencies foreign
+AUTOMAKE_OPTIONS = no-dependencies foreign
 
 INCLUDES = -I$(top_builddir)/include -I$(srcdir)/.. $(INCLUDE_krb4)
 
diff --git a/appl/telnet/telnet/Makefile.am b/appl/telnet/telnet/Makefile.am
index 45a0e6823..21ab202d3 100644
--- a/appl/telnet/telnet/Makefile.am
+++ b/appl/telnet/telnet/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-AUTOHEADER_FLAGS = no-dependencies foreign
+AUTOMAKE_OPTIONS = no-dependencies foreign
 
 INCLUDES = -I$(top_builddir)/include -I$(srcdir)/..
 
diff --git a/appl/telnet/telnetd/Makefile.am b/appl/telnet/telnetd/Makefile.am
index 96147b06d..1c10b8d81 100644
--- a/appl/telnet/telnetd/Makefile.am
+++ b/appl/telnet/telnetd/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-AUTOHEADER_FLAGS = no-dependencies foreign
+AUTOMAKE_OPTIONS = no-dependencies foreign
 
 INCLUDES = -I$(top_builddir)/include -I$(srcdir)/.. $(INCLUDE_krb4)
 
diff --git a/appl/test/Makefile.am b/appl/test/Makefile.am
index ee4df2db0..c68a7b5dc 100644
--- a/appl/test/Makefile.am
+++ b/appl/test/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-AUTOHEADER_FLAGS = no-dependencies foreign
+AUTOMAKE_OPTIONS = no-dependencies foreign
 
 INCLUDES = -I$(top_builddir)/include