diff --git a/Makefile.am b/Makefile.am
index 380ce329..852b496c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,13 +33,14 @@ SPEC			= $(PACKAGE_NAME).spec
 
 TARFILE			= $(PACKAGE_NAME)-$(VERSION).tar.gz
 
-EXTRA_DIST		= autogen.sh conf/corosync.conf.example $(SPEC).in
+EXTRA_DIST		= autogen.sh conf/corosync.conf.example $(SPEC).in \
+			  conf/lenses/tests/test_corosync.aug
 
 AUTOMAKE_OPTIONS	= foreign
 
 MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure depcomp \
 			  config.guess config.sub missing install-sh \
-			  autoheader automake autoconf
+			  autoheader automake autoconf test_lense.sh
 
 dist_doc_DATA		= LICENSE INSTALL README.devmap \
 			  README.recovery SECURITY TODO AUTHORS
@@ -79,9 +80,6 @@ test_lense.sh:
 	echo "augparse -I $(srcdir)/conf/lenses/ $(srcdir)/conf/lenses/tests/test_corosync.aug" > $@
 	chmod +x $@
 
-CLEANFILES = test_lense.sh
-
-
 lint:
 	for dir in lcr lib exec services tools test; do make -C $$dir lint; done
 
@@ -89,10 +87,10 @@ doxygen:
 	mkdir -p doc/api && doxygen
 
 dist-clean-local:
-	rm -f autoconf automake autoheader
+	rm -f autoconf automake autoheader test_lense.sh
 
 clean-generic:
-	rm -rf doc/api $(SPEC) $(TARFILE) 
+	rm -rf doc/api $(SPEC) $(TARFILE) test_lense.sh
 
 ## make rpm/srpm section.
 
diff --git a/cts/agents/Makefile.am b/cts/agents/Makefile.am
index 19c6cc99..5c5c211a 100644
--- a/cts/agents/Makefile.am
+++ b/cts/agents/Makefile.am
@@ -43,6 +43,7 @@ noinst_PROGRAMS = $(TEST_AGENTS)
 noinst_SCRIPTS = mem_leak_test.sh net_breaker.sh
 endif
 
+noinst_HEADERS          = common_test_agent.h
 
 cpg_test_agent_SOURCES = cpg_test_agent.c common_test_agent.c
 cpg_test_agent_LDADD =  -lcpg -lcoroipcc ../../exec/coropoll.o ../../exec/crypto.o