diff --git a/admin/Makefile.am b/admin/Makefile.am
index a20915dce..fbc7388f7 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -1,10 +1,8 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-CFLAGS = @CFLAGS@ $(WFLAGS)
-
-INCLUDES = -I$(top_builddir)/include $(INCLUDE_readline)
+INCLUDES += $(INCLUDE_readline)
 
 man_MANS = ktutil.8
 
@@ -12,8 +10,6 @@ sbin_PROGRAMS = ktutil
 
 ktutil_SOURCES = ktutil.c srvconvert.c
 
-LIB_tgetent = @LIB_tgetent@
-
 LDADD = \
 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
 	$(top_builddir)/lib/krb5/libkrb5.la \
diff --git a/appl/Makefile.am b/appl/Makefile.am
index a46b3c4b9..99aebb883 100644
--- a/appl/Makefile.am
+++ b/appl/Makefile.am
@@ -1,5 +1,7 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = foreign no-dependencies 
+include $(top_srcdir)/Makefile.am.common
+
 SUBDIRS = afsutil ftp login @OTP_dir@ popper push rsh telnet test
+DIST_SUBDIRS = afsutil ftp login otp popper push rsh telnet test
 # kauth kx
diff --git a/appl/afsutil/Makefile.am b/appl/afsutil/Makefile.am
index a36fade09..9699426df 100644
--- a/appl/afsutil/Makefile.am
+++ b/appl/afsutil/Makefile.am
@@ -1,17 +1,15 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
-
-INCLUDES = -I$(top_builddir)/include
+include $(top_srcdir)/Makefile.am.common
 
 if KRB4
 AFSPROGS = afslog
-else
-AFSPROGS = 
 endif
 bin_PROGRAMS = $(AFSPROGS)
 
-LDADD = $(top_builddir)/lib/kafs/libkafs.a $(AIX_EXTRA_KAFS) \
+EXTRA_bin_PROGRAMS = afslog
+
+LDADD = $(LIB_kafs) \
 	$(LIB_krb4) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la \
diff --git a/appl/login/Makefile.am b/appl/login/Makefile.am
index d85f78ae3..82cc82dbe 100644
--- a/appl/login/Makefile.am
+++ b/appl/login/Makefile.am
@@ -1,11 +1,13 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4)
+INCLUDES += $(INCLUDE_krb4)
 
 bin_PROGRAMS = login
-login_SOURCES = login.c read_string.c utmp_login.c utmpx_login.c tty.c stty_default.c
+login_SOURCES = login.c read_string.c utmp_login.c utmpx_login.c \
+	tty.c stty_default.c login_locl.h
+
 
 LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_krb4) \
diff --git a/appl/rsh/Makefile.am b/appl/rsh/Makefile.am
index b127cb108..727fbaf5a 100644
--- a/appl/rsh/Makefile.am
+++ b/appl/rsh/Makefile.am
@@ -1,16 +1,16 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4) -DBINDIR=\"$(bindir)\"
+INCLUDES += $(INCLUDE_krb4) -DBINDIR=\"$(bindir)\"
 
 bin_PROGRAMS = rsh
 
 libexec_PROGRAMS = rshd
 
-rsh_SOURCES  = rsh.c common.c
+rsh_SOURCES  = rsh.c common.c rsh_locl.h
 
-rshd_SOURCES = rshd.c common.c
+rshd_SOURCES = rshd.c common.c rsh_locl.h
 
 LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_krb4) \