diff --git a/.gitignore b/.gitignore
index 5410db9d7..2fee53200 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ macros/ltsugar.m4
 macros/ltdl.m4
 macros/ltversion.m4
 macros/lt~obsolete.m4
+macros/pkg.m4
 rpcrig/rpc.rigd
 rpcrig/rpcrig.h
 rpcrig/rpcrig_clnt.c
diff --git a/Makefile.am b/Makefile.am
index d9766144f..e16ac183b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,15 +9,17 @@ pkgconfig_DATA = hamlib.pc
 EXTRA_DIST = PLAN TODO LICENSE hamlib.m4 hamlib.pc.in README.developer \
 	README.betatester README.win32
 
-# BINDINGS_LIST subdirs are no longer built
-SUBDIRS = libltdl macros include lib $(subdirs) src @BACKEND_LIST@ @ROT_BACKEND_LIST@ \
-			@BINDINGS@ tests doc
+SUBDIRS = libltdl macros include lib src \
+	@BACKEND_LIST@ \
+	@ROT_BACKEND_LIST@ \
+	@BINDINGS@ \
+	tests doc
 
-# perl and kylix subdirs are no longer distributed
-DIST_SUBDIRS = macros include lib $(subdirs) src c++ bindings tests doc \
+DIST_SUBDIRS = libltdl macros include lib src c++ bindings tests doc \
 	icom kenwood aor yaesu dummy pcr alinco uniden tentec kachina jrc \
 	winradio adat easycomm fodtrack drake rotorez \
 	flexradio sartek lowe rft rs tapr kit skanti prm80 wj racal tuner \
 	gs232a heathkit spid ars m2 amsat scripts ts7400 celestron
 
-ACLOCAL_AMFLAGS = -I macros
+# Install any third party macros into our tree for distribution
+ACLOCAL_AMFLAGS = -I macros --install
diff --git a/autogen.sh b/autogen.sh
index 6db98e752..9dd1e7bfd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -64,11 +64,11 @@ test $TEST_TYPE $FILE || {
 ### subtools are processed in the correct order.                ###
 ###################################################################
 
-echo "Running '$AUTORECONF -is' to process configure.ac"
+echo "Running '$AUTORECONF -i' to process configure.ac"
 echo "and generate the configure script."
 
-# Tell autoreconf to install missing files as symbolic links
-$AUTORECONF -is
+# Tell autoreconf to install needed build system files
+$AUTORECONF -i
 
 cd $ORIGDIR