diff --git a/src/Makefile.am b/src/Makefile.am
index 793f674019..272dfbfc5a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1328,6 +1328,7 @@ $(builddir)/locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf
 if WITH_QEMU
 conf_DATA += locking/qemu-sanlock.conf
 BUILT_SOURCES += locking/qemu-sanlock.conf
+DISTCLEANFILES += locking/qemu-sanlock.conf
 endif
 else
 EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8a8be1a4cb..c96c7d9c3d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -28,11 +28,14 @@ EXTRA_DIST = \
 	libvirt-guests.init.sh				\
 	libvirt-guests.sysconf
 
+DISTCLEANFILES =
+
 bin_SCRIPTS = virt-xml-validate virt-pki-validate
 bin_PROGRAMS = virsh
 
 if HAVE_SANLOCK
 sbin_SCRIPTS = virt-sanlock-cleanup
+DISTCLEANFILES += virt-sanlock-cleanup
 endif
 
 dist_man1_MANS = virt-xml-validate.1 virt-pki-validate.1 virsh.1
@@ -187,4 +190,4 @@ CLEANFILES = $(bin_SCRIPTS)
 CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s
 MAINTAINERCLEANFILES = $(dist_man1_MANS)
 
-DISTCLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES += $(BUILT_SOURCES)