diff --git a/Makefile.am b/Makefile.am
index 53c9d2680..db6003068 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,7 @@ all-local: $(SPEC) $(DEBCHANGELOG) $(DEBPOSTINST)
 
 clean-local:
 	rm -f $(SPEC)
+	rm -f $(DEBPOSTINST)
 
 distclean-local:
 	rm -f $(PACKAGE_NAME)-*.tar.*
diff --git a/init/Makefile.am b/init/Makefile.am
index cc48d9b8b..64b392c03 100644
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -13,6 +13,8 @@ include $(top_srcdir)/build-aux/check.mk
 EXTRA_DIST		= kronosnetd.in kronosnetd.service.in \
 			  kronosnetd.default
 
+if BUILD_KRONOSNETD
+
 systemdconfdir		= $(SYSTEMDDIR)
 systemdconf_DATA	= kronosnetd.service
 
@@ -41,3 +43,5 @@ all-local: $(initscript_SCRIPTS) $(systemdconf_DATA)
 
 clean-local:
 	rm -rf $(initscript_SCRIPTS) $(systemdconf_DATA)
+
+endif
diff --git a/kronosnetd/Makefile.am b/kronosnetd/Makefile.am
index a6a36e37d..e20aaf088 100644
--- a/kronosnetd/Makefile.am
+++ b/kronosnetd/Makefile.am
@@ -10,8 +10,6 @@ MAINTAINERCLEANFILES	= Makefile.in kronostnetd.logrotate
 
 include $(top_srcdir)/build-aux/check.mk
 
-if BUILD_KRONOSNETD
-
 EXTRA_DIST		= kronosnetd.logrotate.in
 
 noinst_HEADERS		= \
@@ -24,9 +22,6 @@ noinst_HEADERS		= \
 			  vty_cli_cmds.h \
 			  vty_utils.h 
 
-sbin_PROGRAMS		= kronosnetd \
-			  knet-keygen
-
 kronosnetd_SOURCES	= \
 			  cfg.c \
 			  etherfilter.c \
@@ -55,6 +50,11 @@ knet_keygen_SOURCES	= keygen.c
 
 knet_keygen_CPPFLAGS	= -I$(top_srcdir)/libknet
 
+if BUILD_KRONOSNETD
+
+sbin_PROGRAMS		= kronosnetd \
+			  knet-keygen
+
 dist_man_MANS		= kronosnetd.8 knet-keygen.8
 
 install-exec-local:
diff --git a/libtap/Makefile.am b/libtap/Makefile.am
index bf90d7ce0..261ffda1d 100644
--- a/libtap/Makefile.am
+++ b/libtap/Makefile.am
@@ -15,8 +15,6 @@ SYMFILE			= libtap_exported_syms
 
 EXTRA_DIST		= $(SYMFILE) tap_updown_bad tap_updown_good api-test-coverage
 
-if BUILD_LIBTAP
-
 sources			= libtap.c
 
 libversion		= 0:0:0
@@ -24,6 +22,8 @@ libversion		= 0:0:0
 # override global LIBS that pulls in lots of craft we don't need here
 LIBS			= -lpthread
 
+if BUILD_LIBTAP
+
 include_HEADERS		= libtap.h
 
 pkgconfigdir		= $(libdir)/pkgconfig