diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index d7c21f712f45d140cd94442e6195f7dc5b1d9c69..bb97ab963dda3f01c721cf3f4582e01176c87896 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -46,6 +46,14 @@ DAEMON_SOURCES =					\
 
 LIBVIRTD_CONF_SOURCES = libvirtd-config.c libvirtd-config.h
 
+PODFILES = \
+	libvirtd.pod \
+	$(NULL)
+
+MANINFILES = \
+	libvirtd.8.in \
+	$(NULL)
+
 DISTCLEANFILES =
 EXTRA_DIST =						\
 	remote_dispatch.h				\
@@ -69,8 +77,8 @@ EXTRA_DIST =						\
 	libvirtd.uml.logrotate.in                       \
 	test_libvirtd.aug.in                             \
 	THREADS.txt					\
-	libvirtd.pod					\
-	libvirtd.8.in					\
+	$(PODFILES)					\
+	$(MANINFILES)					\
 	$(DAEMON_SOURCES)				\
 	$(LIBVIRTD_CONF_SOURCES)			\
 	$(NULL)
@@ -529,4 +537,4 @@ endif ! WITH_SASL
 
 CLEANFILES += $(BUILT_SOURCES) $(man8_MANS)
 CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda
-MAINTAINERCLEANFILES = libvirtd.8.in $(DAEMON_GENERATED)
+MAINTAINERCLEANFILES = $(MANINFILES) $(DAEMON_GENERATED)
diff --git a/src/Makefile.am b/src/Makefile.am
index 238363cc3c9365697113a9addde96c054201c107..ad009352a7956bcde2d08a47db710a1050e90a04 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2588,25 +2588,32 @@ augeas_DATA += locking/virtlockd.aug logging/virtlogd.aug
 augeastest_DATA += test_virtlockd.aug test_virtlogd.aug
 endif WITH_LIBVIRTD
 
-CLEANFILES += test_virtlockd.aug virtlockd.8 \
-	      test_virtlogd.aug virtlogd.8
-MAINTAINERCLEANFILES += virtlockd.8.in virtlogd.8.in
+PODFILES = \
+	locking/virtlockd.pod \
+	logging/virtlogd.pod \
+	$(NULL)
+
+MANINFILES = \
+	virtlockd.8.in \
+	virtlogd.8.in \
+	$(NULL)
+
+CLEANFILES += test_virtlockd.aug test_virtlogd.aug $(man8_MANS)
+MAINTAINERCLEANFILES += $(MANINFILES)
 
 EXTRA_DIST += \
         locking/virtlockd.service.in \
         locking/virtlockd.socket.in \
-        locking/virtlockd.pod \
-        virtlockd.8.in \
         locking/virtlockd.aug \
         locking/virtlockd.conf \
         locking/test_virtlockd.aug.in \
         logging/virtlogd.service.in \
         logging/virtlogd.socket.in \
-        logging/virtlogd.pod \
-        virtlogd.8.in \
         logging/virtlogd.aug \
         logging/virtlogd.conf \
         logging/test_virtlogd.aug.in \
+        $(PODFILES) \
+        $(MANINFILES) \
         $(NULL)
 
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9892060c3559887b1eccc73d66735c1b59700fd0..845d48f49a94e9c24cb56f6d54aa667b15093327 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -35,26 +35,32 @@ ICON_FILES = \
 	libvirt_win_icon_64x64.ico \
 	virsh_win_icon.rc
 
+PODFILES = \
+	virt-admin.pod \
+	virt-host-validate.pod \
+	virt-login-shell.pod \
+	virt-pki-validate.pod \
+	virt-sanlock-cleanup.pod \
+	virt-xml-validate.pod \
+	virsh.pod \
+	$(NULL)
+
+MANINFILES = \
+	virt-admin.1.in \
+	virt-host-validate.1.in \
+	virt-login-shell.1.in \
+	virt-pki-validate.1.in \
+	virt-sanlock-cleanup.8.in \
+	virt-xml-validate.1.in \
+	virsh.1.in \
+	$(NULL)
+
 EXTRA_DIST = \
 	$(ICON_FILES)					\
 	$(conf_DATA)					\
 	virt-xml-validate.in				\
 	virt-pki-validate.in				\
 	virt-sanlock-cleanup.in				\
-	virt-admin.pod					\
-	virt-host-validate.pod				\
-	virt-login-shell.pod				\
-	virt-pki-validate.pod				\
-	virt-sanlock-cleanup.pod			\
-	virt-xml-validate.pod				\
-	virsh.pod					\
-	virt-admin.1.in					\
-	virt-host-validate.1.in				\
-	virt-login-shell.1.in				\
-	virt-pki-validate.1.in				\
-	virt-sanlock-cleanup.8.in			\
-	virt-xml-validate.1.in				\
-	virsh.1.in					\
 	libvirt-guests.sysconf				\
 	virsh-edit.c					\
 	virsh-domain.c					\
@@ -63,7 +69,10 @@ EXTRA_DIST = \
 	virsh-network.c virsh-nodedev.c			\
 	virsh-nwfilter.c virsh-pool.c			\
 	virsh-secret.c virsh-snapshot.c			\
-	virsh-volume.c
+	virsh-volume.c					\
+	$(PODFILES)					\
+	$(MANINFILES)					\
+	$(NULL)
 
 
 CLEANFILES =