diff --git a/src/Makefile.am b/src/Makefile.am
index da7e2e6c80..4a0c121a7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -655,13 +655,13 @@ endif WITH_LIBVIRTD
 		< $< > $@-t && \
 	mv $@-t $@
 
-CLEANFILES += $(man8_MANS)
-MAINTAINERCLEANFILES += $(MANINFILES)
+CLEANFILES += \
+	$(man8_MANS) \
+	$(MANINFILES)
 
 EXTRA_DIST += \
         $(SYSTEMD_UNIT_FILES_IN) \
         $(PODFILES) \
-        $(MANINFILES) \
         $(NULL)
 
 
diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am
index 2d871ec8aa..fd0a5d8098 100644
--- a/src/access/Makefile.inc.am
+++ b/src/access/Makefile.inc.am
@@ -43,13 +43,14 @@ ACCESS_DRIVER_POLKIT_POLICY = access/org.libvirt.api.policy
 GENERATED_SYM_FILES += $(ACCESS_DRIVER_SYM_FILES)
 
 EXTRA_DIST += \
-	$(ACCESS_DRIVER_POLKIT_POLICY) \
 	access/genpolkit.pl \
 	$(NULL)
 
 
 libvirt_driver_access_la_SOURCES = \
 	$(ACCESS_DRIVER_SOURCES) \
+	$(NULL)
+nodist_libvirt_driver_access_la_SOURCES = \
 	$(ACCESS_DRIVER_GENERATED) \
 	$(NULL)
 noinst_LTLIBRARIES += libvirt_driver_access.la
diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am
index 448f7e1203..3feb23aa20 100644
--- a/src/admin/Makefile.inc.am
+++ b/src/admin/Makefile.inc.am
@@ -9,22 +9,21 @@ ADMIN_PROTOCOL_GENERATED = \
 	admin/admin_server_dispatch_stubs.h \
 	$(NULL)
 
-EXTRA_DIST += $(ADMIN_PROTOCOL) $(ADMIN_PROTOCOL_GENERATED)
+EXTRA_DIST += $(ADMIN_PROTOCOL)
 BUILT_SOURCES += $(ADMIN_PROTOCOL_GENERATED)
-MAINTAINERCLEANFILES += $(ADMIN_PROTOCOL_GENERATED)
+CLEANFILES += $(ADMIN_PROTOCOL_GENERATED)
 
 admin/admin_server_dispatch.c: admin/admin_server_dispatch_stubs.h
 
 noinst_LTLIBRARIES += libvirt_driver_admin.la
 libvirt_driver_admin_la_SOURCES = \
-	admin/admin_protocol.c \
-	admin/admin_protocol.h \
 	admin/admin_server.c \
 	admin/admin_server.h \
 	admin/admin_server_dispatch.c \
 	admin/admin_server_dispatch.h \
-	admin/admin_server_dispatch_stubs.h \
 	$(NULL)
+nodist_libvirt_driver_admin_la_SOURCES = \
+	$(ADMIN_PROTOCOL_GENERATED)
 libvirt_driver_admin_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(XDR_CFLAGS) \
@@ -60,9 +59,11 @@ lib_LTLIBRARIES += libvirt-admin.la
 
 libvirt_admin_la_SOURCES = \
 	admin/libvirt-admin.c \
-	$(ADMIN_PROTOCOL_GENERATED) \
 	$(DATATYPES_SOURCES)
 
+nodist_libvirt_admin_la_SOURCES = \
+	$(ADMIN_PROTOCOL_GENERATED)
+
 libvirt_admin_la_LDFLAGS = \
 	$(VERSION_SCRIPT_FLAGS)$(LIBVIRT_ADMIN_SYMBOL_FILE) \
 	-version-info $(LIBVIRT_VERSION_INFO) \
diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index 96ae2f5044..de9fbe9239 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -56,6 +56,7 @@ augeastest_DATA += bhyve/test_virtbhyved.aug
 CLEANFILES += bhyve/virtbhyved.aug
 
 virtbhyved_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodist_virtbhyved_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtbhyved_CFLAGS = \
        $(REMOTE_DAEMON_CFLAGS) \
        -DDAEMON_NAME="\"virtbhyved\"" \
diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am
index 7ba9fd1758..6b10755b7e 100644
--- a/src/esx/Makefile.inc.am
+++ b/src/esx/Makefile.inc.am
@@ -44,7 +44,6 @@ ESX_DRIVER_EXTRA_DIST = \
 	esx/README \
 	esx/esx_vi_generator.input \
 	esx/esx_vi_generator.py \
-	$(ESX_DRIVER_GENERATED) \
 	$(NULL)
 
 ESX_GENERATED_STAMP = .esx_vi_generator.stamp
@@ -54,7 +53,6 @@ DRIVER_SOURCE_FILES += $(ESX_DRIVER_SOURCES)
 EXTRA_DIST += \
 	$(ESX_DRIVER_SOURCES) \
 	$(ESX_DRIVER_EXTRA_DIST) \
-	$(ESX_GENERATED_STAMP) \
 	$(NULL)
 
 BUILT_SOURCES += $(ESX_DRIVER_GENERATED)
@@ -66,7 +64,7 @@ $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \
 	$(AM_V_GEN) $(RUNUTF8) $(PYTHON) \
 		$(srcdir)/esx/esx_vi_generator.py $(srcdir) $(builddir) && touch $@
 
-MAINTAINERCLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP)
+CLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP)
 
 if WITH_ESX
 USED_SYM_FILES += $(srcdir)/libvirt_esx.syms
diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am
index 79e94d09bb..b71602c971 100644
--- a/src/hyperv/Makefile.inc.am
+++ b/src/hyperv/Makefile.inc.am
@@ -24,8 +24,6 @@ HYPERV_GENERATED_STAMP = .hyperv_wmi_generator.stamp
 HYPERV_DRIVER_EXTRA_DIST = \
 	hyperv/hyperv_wmi_generator.input \
 	hyperv/hyperv_wmi_generator.py \
-	$(HYPERV_DRIVER_GENERATED) \
-	$(HYPERV_GENERATED_STAMP) \
 	$(NULL)
 
 DRIVER_SOURCE_FILES += $(HYPERV_DRIVER_SOURCES)
@@ -45,7 +43,7 @@ $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \
 	  $(srcdir)/hyperv/hyperv_wmi_generator.py $(srcdir) $(builddir) \
 	  && touch $@
 
-MAINTAINERCLEANFILES += $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP)
+CLEANFILES += $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP)
 
 if WITH_HYPERV
 noinst_LTLIBRARIES += libvirt_driver_hyperv.la
diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index 30ea98ad15..5f22b90cb4 100644
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -52,6 +52,7 @@ augeastest_DATA += interface/test_virtinterfaced.aug
 CLEANFILES += interface/virtinterfaced.aug
 
 virtinterfaced_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodist_virtinterfaced_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtinterfaced_CFLAGS = \
        $(REMOTE_DAEMON_CFLAGS) \
        -DDAEMON_NAME="\"virtinterfaced\"" \
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 5d9cf14f7f..8686e78a5d 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -64,6 +64,7 @@ augeastest_DATA += libxl/test_virtxend.aug
 CLEANFILES += libxl/virtxend.aug
 
 virtxend_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodist_virtxend_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtxend_CFLAGS = \
        $(REMOTE_DAEMON_CFLAGS) \
        -DDAEMON_NAME="\"virtxend\"" \
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 2bfb662016..5c2361a581 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -43,8 +43,6 @@ LOCK_DAEMON_SOURCES = \
 
 EXTRA_DIST += \
 	$(LOCK_PROTOCOL) \
-	$(LOCK_PROTOCOL_GENERATED) \
-	$(LOCK_DAEMON_GENERATED) \
 	$(LOCK_DAEMON_SOURCES) \
 	$(LOCK_DRIVER_LOCKD_SOURCES) \
 	$(LOCK_DRIVER_SOURCES) \
@@ -64,7 +62,7 @@ BUILT_SOURCES += \
 	$(LOCK_DAEMON_GENERATED) \
 	$(NULL)
 
-MAINTAINERCLEANFILES += \
+CLEANFILES += \
 	$(LOCK_PROTOCOL_GENERATED) \
 	$(LOCK_DAEMON_GENERATED) \
 	$(NULL)
@@ -105,6 +103,8 @@ if WITH_LIBVIRTD
 lockdriver_LTLIBRARIES += lockd.la
 lockd_la_SOURCES = \
 	$(LOCK_DRIVER_LOCKD_SOURCES) \
+	$(NULL)
+nodist_lockd_la_SOURCES = \
 	$(LOCK_PROTOCOL_GENERATED) \
 	$(NULL)
 lockd_la_CFLAGS = \
@@ -145,6 +145,8 @@ sbin_PROGRAMS += virtlockd
 
 virtlockd_SOURCES = \
 	$(LOCK_DAEMON_SOURCES) \
+	$(NULL)
+nodist_virtlockd_SOURCES = \
 	$(LOCK_PROTOCOL_GENERATED) \
 	$(LOCK_DAEMON_GENERATED) \
 	$(NULL)
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index dbaac2bb0d..fba54239d5 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -10,7 +10,6 @@ LOG_DAEMON_GENERATED = \
 	$(NULL)
 
 LOG_DRIVER_SOURCES = \
-	$(LOG_PROTOCOL_GENERATED) \
 	logging/log_manager.c \
 	logging/log_manager.h \
 	$(NULL)
@@ -30,10 +29,8 @@ LOG_PROTOCOL = $(srcdir)/logging/log_protocol.x
 
 EXTRA_DIST += \
 	$(LOG_PROTOCOL) \
-	$(LOG_PROTOCOL_GENERATED) \
-	$(LOG_DAEMON_GENERATED) \
 	$(LOG_DAEMON_SOURCES) \
-	$(LOG_DRIVER_SOURCES) \
+	$(LOG_DRIVER) \
         logging/virtlogd.aug \
         logging/virtlogd.conf \
         logging/test_virtlogd.aug.in \
@@ -42,7 +39,7 @@ BUILT_SOURCES += \
 	$(LOG_PROTOCOL_GENERATED) \
 	$(LOG_DAEMON_GENERATED) \
 	$(NULL)
-MAINTAINERCLEANFILES += \
+CLEANFILES += \
 	$(LOG_PROTOCOL_GENERATED) \
 	$(LOG_DAEMON_GENERATED) \
 	$(NULL)
@@ -66,6 +63,9 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_log.la
 libvirt_driver_log_la_SOURCES = \
 	$(LOG_DRIVER_SOURCES) \
 	$(NULL)
+nodist_libvirt_driver_log_la_SOURCES = \
+	$(LOG_PROTOCOL_GENERATED) \
+	$(NULL)
 libvirt_driver_log_la_CFLAGS = \
 	-I$(builddir)/logging \
 	-I$(builddir)/rpc \
@@ -80,6 +80,8 @@ man8_MANS += virtlogd.8
 
 virtlogd_SOURCES = \
 		$(LOG_DAEMON_SOURCES) \
+		$(NULL)
+nodist_virtlogd_SOURCES = \
 		$(LOG_PROTOCOL_GENERATED) \
 		$(LOG_DAEMON_GENERATED) \
 		$(NULL)
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index cb55dfd1c6..d3a7cbf93b 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -22,8 +22,6 @@ LXC_GENERATED = \
 LXC_MONITOR_PROTOCOL = $(srcdir)/lxc/lxc_monitor_protocol.x
 
 LXC_DRIVER_SOURCES = \
-	$(LXC_MONITOR_PROTOCOL_GENERATED) \
-	$(LXC_MONITOR_GENERATED) \
 	lxc/lxc_conf.c \
 	lxc/lxc_conf.h \
 	lxc/lxc_container.c \
@@ -47,8 +45,6 @@ LXC_DRIVER_SOURCES = \
 	$(NULL)
 
 LXC_CONTROLLER_SOURCES = \
-	$(LXC_MONITOR_PROTOCOL_GENERATED) \
-	$(LXC_CONTROLLER_GENERATED) \
 	lxc/lxc_conf.c \
 	lxc/lxc_conf.h \
 	lxc/lxc_container.c \
@@ -62,13 +58,17 @@ LXC_CONTROLLER_SOURCES = \
 	lxc/lxc_controller.c \
 	$(NULL)
 
-
-DRIVER_SOURCE_FILES += $(LXC_DRIVER_SOURCES)
-STATEFUL_DRIVER_SOURCE_FILES += $(LXC_DRIVER_SOURCES)
+DRIVER_SOURCE_FILES += \
+	$(LXC_MONITOR_PROTOCOL_GENERATED) \
+	$(LXC_MONITOR_GENERATED) \
+	$(LXC_DRIVER_SOURCES)
+STATEFUL_DRIVER_SOURCE_FILES += \
+	$(LXC_MONITOR_PROTOCOL_GENERATED) \
+	$(LXC_MONITOR_GENERATED) \
+	$(LXC_DRIVER_SOURCES)
 EXTRA_DIST += \
 	$(LXC_DRIVER_SOURCES) \
 	$(LXC_MONITOR_PROTOCOL) \
-	$(LXC_GENERATED) \
 	$(LXC_CONTROLLER_SOURCES) \
 	$(NULL)
 
@@ -112,7 +112,11 @@ libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS)
 libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS)
 endif WITH_BLKID
 libvirt_driver_lxc_impl_la_LIBADD += $(SECDRIVER_LIBS)
-libvirt_driver_lxc_impl_la_SOURCES = $(LXC_DRIVER_SOURCES)
+libvirt_driver_lxc_impl_la_SOURCES = \
+	$(LXC_DRIVER_SOURCES)
+nodist_libvirt_driver_lxc_impl_la_SOURCES = \
+	$(LXC_MONITOR_PROTOCOL_GENERATED) \
+	$(LXC_MONITOR_GENERATED)
 
 
 sbin_PROGRAMS += virtlxcd
@@ -123,6 +127,7 @@ augeastest_DATA += lxc/test_virtlxcd.aug
 CLEANFILES += lxc/virtlxcd.aug
 
 virtlxcd_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodst_virtlxcd_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtlxcd_CFLAGS = \
        $(REMOTE_DAEMON_CFLAGS) \
        -DDAEMON_NAME="\"virtlxcd\"" \
@@ -183,6 +188,10 @@ libvirt_lxc_SOURCES = \
 	$(LXC_CONTROLLER_SOURCES) \
 	$(DATATYPES_SOURCES) \
 	$(NULL)
+nodist_libvirt_lxc_SOURCES = \
+	$(LXC_MONITOR_PROTOCOL_GENERATED) \
+	$(LXC_CONTROLLER_GENERATED) \
+	$(NULL)
 libvirt_lxc_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	$(PIE_LDFLAGS) \
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 2f7932ae60..58dd90c23b 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -59,6 +59,7 @@ augeastest_DATA += network/test_virtnetworkd.aug
 CLEANFILES += network/virtnetworkd.aug
 
 virtnetworkd_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodist_virtnetworkd_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtnetworkd_CFLAGS = \
        $(REMOTE_DAEMON_CFLAGS) \
        -DDAEMON_NAME="\"virtnetworkd\"" \
diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index 1dfa0a5274..2a8c437e7b 100644
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -77,6 +77,7 @@ augeastest_DATA += node_device/test_virtnodedevd.aug
 CLEANFILES += node_device/virtnodedevd.aug
 
 virtnodedevd_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodist_virtnodedevd_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtnodedevd_CFLAGS = \
        $(REMOTE_DAEMON_CFLAGS) \
        -DDAEMON_NAME="\"virtnodedevd\"" \
diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
index ca05cba934..c320b75f78 100644
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -60,6 +60,7 @@ augeastest_DATA += nwfilter/test_virtnwfilterd.aug
 CLEANFILES += nwfilter/virtnwfilterd.aug
 
 virtnwfilterd_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodist_virtnwfilterd_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtnwfilterd_CFLAGS = \
        $(REMOTE_DAEMON_CFLAGS) \
        -DDAEMON_NAME="\"virtnwfilterd\"" \
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 69e290c428..3f3476b2b4 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -134,6 +134,7 @@ augeastest_DATA += qemu/test_virtqemud.aug
 CLEANFILES += qemu/virtqemud.aug
 
 virtqemud_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodist_virtqemud_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtqemud_CFLAGS = \
        $(REMOTE_DAEMON_CFLAGS) \
        -DDAEMON_NAME="\"virtqemud\"" \
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 242eb3ed2d..f5de92be23 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -15,7 +15,6 @@ REMOTE_DRIVER_GENERATED = \
 REMOTE_DRIVER_SOURCES = \
 	remote/remote_driver.c \
 	remote/remote_driver.h \
-	$(REMOTE_DRIVER_GENERATED) \
 	$(NULL)
 
 REMOTE_DAEMON_GENERATED = \
@@ -33,7 +32,6 @@ REMOTE_DAEMON_SOURCES = \
 	remote/remote_daemon_dispatch.h \
 	remote/remote_daemon_stream.c \
 	remote/remote_daemon_stream.h \
-	$(REMOTE_DAEMON_GENERATED) \
 	$(NULL)
 
 REMOTE_DAEMON_CFLAGS = \
@@ -140,7 +138,9 @@ REMOTE_DRIVER_PROTOCOL = \
 	$(LXC_PROTOCOL) \
 	$(NULL)
 
-DRIVER_SOURCE_FILES += $(REMOTE_DRIVER_SOURCES)
+DRIVER_SOURCE_FILES += \
+	$(REMOTE_DRIVER_GENERATED) \
+	$(REMOTE_DRIVER_SOURCES)
 
 EXTRA_DIST += \
 	$(REMOTE_DRIVER_PROTOCOL) \
@@ -161,11 +161,9 @@ BUILT_SOURCES += \
 	$(REMOTE_DRIVER_GENERATED) \
 	$(REMOTE_DAEMON_GENERATED) \
 	$(NULL)
-MAINTAINERCLEANFILES += \
+CLEANFILES += \
 	$(REMOTE_DRIVER_GENERATED) \
 	$(REMOTE_DAEMON_GENERATED) \
-	$(NULL)
-CLEANFILES += \
 	remote/libvirtd.conf \
 	remote/virtproxyd.conf \
 	$(NULL)
@@ -182,10 +180,13 @@ libvirt_driver_remote_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(NULL)
 libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES)
+libvirt_driver_remote_la_SOURCES = \
+	$(REMOTE_DRIVER_SOURCES)
+nodist_libvirt_driver_remote_la_SOURCES = \
+	$(REMOTE_DRIVER_GENERATED)
 
 if WITH_DTRACE_PROBES
-nodist_libvirt_driver_remote_la_SOURCES = libvirt_probes.h
+nodist_libvirt_driver_remote_la_SOURCES += libvirt_probes.h
 endif WITH_DTRACE_PROBES
 
 if WITH_SASL
@@ -230,6 +231,8 @@ man8_MANS += libvirtd.8
 
 libvirtd_SOURCES = $(REMOTE_DAEMON_SOURCES)
 
+nodist_libvirtd_SOURCES = $(REMOTE_DAEMON_GENERATED)
+
 libvirtd_CFLAGS = \
 	$(REMOTE_DAEMON_CFLAGS) \
 	-DSOCK_PREFIX="\"libvirt\"" \
@@ -243,6 +246,7 @@ libvirtd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
 libvirtd_LDADD = $(REMOTE_DAEMON_LD_ADD)
 
 virtproxyd_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodist_virtproxyd_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtproxyd_CFLAGS = \
 	$(REMOTE_DAEMON_CFLAGS) \
 	-DSOCK_PREFIX="\"libvirt\"" \
diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am
index 4aa38db1ab..a5bde92c9f 100644
--- a/src/rpc/Makefile.inc.am
+++ b/src/rpc/Makefile.inc.am
@@ -16,7 +16,7 @@ VIR_NET_RPC_GENERATED = \
 	$(NULL)
 
 BUILT_SOURCES += $(VIR_NET_RPC_GENERATED)
-MAINTAINERCLEANFILES += $(VIR_NET_RPC_GENERATED)
+CLEANFILES += $(VIR_NET_RPC_GENERATED)
 
 noinst_LTLIBRARIES += \
 	libvirt-net-rpc.la \
@@ -39,6 +39,9 @@ libvirt_net_rpc_la_SOURCES = \
 	rpc/virnetsocket.c \
 	rpc/virkeepalive.h \
 	rpc/virkeepalive.c \
+	$(NULL)
+
+nodist_libvirt_net_rpc_la_SOURCES = \
 	$(VIR_NET_RPC_GENERATED) \
 	$(NULL)
 
diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
index 94f293d418..3d77366d3c 100644
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -48,6 +48,7 @@ augeastest_DATA += secret/test_virtsecretd.aug
 CLEANFILES += secret/virtsecretd.aug
 
 virtsecretd_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodist_virtsecretd_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtsecretd_CFLAGS = \
 	$(REMOTE_DAEMON_CFLAGS) \
 	-DDAEMON_NAME="\"virtsecretd\"" \
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index ec35ab7665..1dfe48668f 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -152,6 +152,7 @@ augeastest_DATA += storage/test_virtstoraged.aug
 CLEANFILES += storage/virtstoraged.aug
 
 virtstoraged_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodist_virtstoraged_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtstoraged_CFLAGS = \
        $(REMOTE_DAEMON_CFLAGS) \
        -DDAEMON_NAME="\"virtstoraged\"" \
diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
index d8c8e61c4b..0eadef71ca 100644
--- a/src/util/Makefile.inc.am
+++ b/src/util/Makefile.inc.am
@@ -253,9 +253,8 @@ KEYMANS = $(KEYPODS:%.pod=%.7)
 
 man7_MANS += $(KEYMANS)
 
-UTIL_SOURCES += $(KEYTABLES)
 BUILT_SOURCES += $(KEYTABLES)
-MAINTAINERCLEANFILES += $(KEYTABLES)
+CLEANFILES += $(KEYTABLES)
 CLEANFILES += $(KEYMANS) $(KEYPODS)
 
 UTIL_IO_HELPER_SOURCES = util/iohelper.c
@@ -266,6 +265,9 @@ libvirt_la_BUILT_LIBADD += libvirt_util.la
 libvirt_util_la_SOURCES = \
 	$(UTIL_SOURCES) \
 	$(NULL)
+nodist_libvirt_util_la_SOURCES = \
+	$(KEYTABLES) \
+	$(NULL)
 libvirt_util_la_CFLAGS = \
 	$(CAPNG_CFLAGS) \
 	$(YAJL_CFLAGS) \
diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
index 346a84429b..551189c0f5 100644
--- a/src/vbox/Makefile.inc.am
+++ b/src/vbox/Makefile.inc.am
@@ -73,6 +73,7 @@ augeastest_DATA += vbox/test_virtvboxd.aug
 CLEANFILES += vbox/virtvboxd.aug
 
 virtvboxd_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodist_virtvboxd_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtvboxd_CFLAGS = \
        $(REMOTE_DAEMON_CFLAGS) \
        -DDAEMON_NAME="\"virtvboxd\"" \
diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am
index c5bef04088..1757c8ba10 100644
--- a/src/vz/Makefile.inc.am
+++ b/src/vz/Makefile.inc.am
@@ -47,6 +47,7 @@ augeastest_DATA += vz/test_virtvzd.aug
 CLEANFILES += vz/virtvzd.aug
 
 virtvzd_SOURCES = $(REMOTE_DAEMON_SOURCES)
+nodist_virtvzd_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtvzd_CFLAGS = \
        $(REMOTE_DAEMON_CFLAGS) \
        -DDAEMON_NAME="\"virtvzd\"" \