diff --git a/Makefile.am b/Makefile.am
index 4e40350cc..a589c5d92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = foreign no-dependencies ansi2knr
-SUBDIRS	= include lib kuser kdc admin appl
+AUTOMAKE_OPTIONS = foreign no-dependencies
+SUBDIRS	= include lib kuser kdc admin appl doc
diff --git a/appl/Makefile.am b/appl/Makefile.am
index a935c7f1b..6c58c4179 100644
--- a/appl/Makefile.am
+++ b/appl/Makefile.am
@@ -1,4 +1,4 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = foreign no-dependencies ansi2knr
+AUTOMAKE_OPTIONS = foreign no-dependencies
 SUBDIRS	= test rsh telnet
diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am
index 2c1aa7777..a12f0e831 100644
--- a/lib/gssapi/Makefile.am
+++ b/lib/gssapi/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies
+AUTOMAKE_OPTIONS = no-dependencies foreign
 
 INCLUDES = -I$(top_builddir)/include -I$(srcdir)/../krb5
 
diff --git a/lib/gssapi/krb5/Makefile.am b/lib/gssapi/krb5/Makefile.am
index 2c1aa7777..a12f0e831 100644
--- a/lib/gssapi/krb5/Makefile.am
+++ b/lib/gssapi/krb5/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies
+AUTOMAKE_OPTIONS = no-dependencies foreign
 
 INCLUDES = -I$(top_builddir)/include -I$(srcdir)/../krb5