--- rancid-2.3.8/configure.in
+++ rancid-2.3.8/configure.in
@@ -17,7 +17,7 @@
 dnl default install location
 AC_PREFIX_DEFAULT(/usr/local/rancid)
 
-dnl AM_MAINTAINER_MODE()
+AM_MAINTAINER_MODE()
 
 dnl AC_CONFIG_SUBDIRS(util)
 
@@ -35,7 +35,6 @@
 
 # compiler specifics
 AC_PROG_CC
-AM_C_PROTOTYPES
 AC_PROG_CPP
 AC_C_CONST
 AC_C_INLINE
@@ -212,7 +212,7 @@
 # is good enough -- if we can't find GNU tar, we don't really care.
 AC_CHECK_PROGS(TAR, gnutar gtar tar)
 
-AC_CHECK_PROGS(AUTOMAKE, automake)
+dnl AC_CHECK_PROGS(AUTOMAKE, automake)
 
 dnl locate perl 5 and expect.
 AC_PROG_INSTALL
--- rancid-2.3.8/Makefile.am
+++ rancid-2.3.8/Makefile.am
@@ -24,7 +24,7 @@
 
 @SET_MAKE@
 
-pkgdata_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
+dist_doc_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
 EXTRA_DIST = BUGS Todo configure install-sh \
 	mkinstalldirs Makefile.in Todo $(pkgdata_DATA)
 #DIST_COMMON = 
--- rancid-2.3.8/share/Makefile.am
+++ rancid-2.3.8/share/Makefile.am
@@ -50,8 +50,9 @@
 
 pkgdata_SCRIPTS= rancid-cvspurge rtrfilter downreport
 dist_pkgdata_SCRIPTS=getipacctg
-dist_pkgdata_DATA=README.misc cisco-load.exp cisco-reload.exp \
-	index.html lgnotes.html
+dist_pkgdata_DATA=cisco-load.exp cisco-reload.exp
+dist_doc_DATA=README.misc
+dist_html_DATA=index.html lgnotes.html
 
 EXTRA_DIST = rancid-cvspurge.in rancid.spec rtrfilter.in downreport.in
 
--- rancid-2.3.8/etc/Makefile.am
+++ rancid-2.3.8/etc/Makefile.am
@@ -48,7 +48,7 @@
 #AUTOMAKE_OPTIONS=foreign no-dependencies
 AUTOMAKE_OPTIONS=foreign
 
-pkgdata_DATA= lg.conf.sample rancid.conf.sample
+dist_doc_DATA= lg.conf.sample rancid.conf.sample
 EXTRA_DIST= $(pkgdata_DATA:%=%.in)
 
 CLEANFILES= $(pkgdata_DATA)