diff --git a/Makefile.am b/Makefile.am
index b8ae113aa..fbf892a2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -348,6 +348,9 @@ clean-local:
 	-find . -name '*.bak' -delete
 	-find . -name '*.orig' -delete
 
+DISTCLEANFILES = \
+	ChangeLog
+
 # If you don't want to run all of the tests ('make check') then this
 # will just run libguestfs-test-tool for a quick check.  Note this
 # is NOT a substitute for proper testing!
diff --git a/align/Makefile.am b/align/Makefile.am
index d54fab8fd..43cd4f905 100644
--- a/align/Makefile.am
+++ b/align/Makefile.am
@@ -22,7 +22,9 @@ EXTRA_DIST = \
 	test-virt-alignment-scan-guests.sh \
 	virt-alignment-scan.pod
 
-CLEANFILES = stamp-virt-alignment-scan.pod
+CLEANFILES = \
+	stamp-virt-alignment-scan.pod \
+	virt-alignment-scan.1
 
 bin_PROGRAMS = virt-alignment-scan
 
diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 004c8a111..c83b1ab74 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -145,5 +145,7 @@ CLEANFILES = \
 	stamp-libguestfs-make-fixed-appliance.pod
 
 DISTCLEANFILES = \
+	make.sh \
+	packagelist \
 	stamp-supermin \
 	supermin.d/*
diff --git a/builder/Makefile.am b/builder/Makefile.am
index a56390877..6742822a1 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -39,7 +39,17 @@ EXTRA_DIST = \
 	virt-index-validate.pod \
 	yajl_tests.ml
 
-CLEANFILES = *~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o virt-builder
+CLEANFILES = \
+	*~ \
+	*.annot \
+	*.cache \
+	*.cmi \
+	*.cmo \
+	*.cmx \
+	*.cmxa \
+	*.log \
+	*.o \
+	virt-builder
 
 SOURCES_MLI = \
 	cache.mli \
@@ -219,7 +229,7 @@ stamp-virt-builder.pod: virt-builder.pod $(top_srcdir)/customize/customize-synop
 	  $<
 	touch $@
 
-CLEANFILES += stamp-virt-builder.pod
+CLEANFILES += stamp-virt-builder.pod virt-builder.1
 
 # Tests.
 
@@ -362,7 +372,8 @@ CLEANFILES += \
 	index-parse.c \
 	index-parse.h \
 	index-scan.c \
-	stamp-virt-index-validate.pod
+	stamp-virt-index-validate.pod \
+	virt-index-validate.1
 
 if HAVE_OCAML
 # Automake-generated makefile has a rule ".y.c" but lacks a rule ".y.h".
diff --git a/cat/Makefile.am b/cat/Makefile.am
index db981c65e..b25b06931 100644
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -31,7 +31,11 @@ CLEANFILES = \
 	stamp-virt-cat.pod \
 	stamp-virt-filesystems.pod \
 	stamp-virt-log.pod \
-	stamp-virt-ls.pod
+	stamp-virt-ls.pod \
+	virt-cat.1 \
+	virt-filesystems.1 \
+	virt-log.1 \
+	virt-ls.1
 
 bin_PROGRAMS = virt-cat virt-filesystems virt-log virt-ls
 
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index e1522a62e..1a23cda48 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -17,7 +17,9 @@
 
 include $(top_srcdir)/subdir-rules.mk
 
-CLEANFILES = stamp-guestfsd.pod
+CLEANFILES = \
+	stamp-guestfsd.pod \
+	guestfsd.8
 
 generator_built = \
 	actions.h \
diff --git a/df/Makefile.am b/df/Makefile.am
index 9f7d118df..6bbf88d3f 100644
--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -23,7 +23,9 @@ EXTRA_DIST = \
 	test-virt-df-guests.sh \
 	virt-df.pod
 
-CLEANFILES = stamp-virt-df.pod
+CLEANFILES = \
+	stamp-virt-df.pod \
+	virt-df.1
 
 bin_PROGRAMS = virt-df
 
diff --git a/dib/Makefile.am b/dib/Makefile.am
index d8c73b142..0786d6496 100644
--- a/dib/Makefile.am
+++ b/dib/Makefile.am
@@ -121,7 +121,9 @@ stamp-virt-dib.pod: virt-dib.pod
 	  $<
 	touch $@
 
-CLEANFILES += stamp-virt-dib.pod
+CLEANFILES += \
+	stamp-virt-dib.pod \
+	virt-dib.1
 
 # Dependencies.
 depend: .depend
diff --git a/diff/Makefile.am b/diff/Makefile.am
index 95c186f1c..d3b5ff691 100644
--- a/diff/Makefile.am
+++ b/diff/Makefile.am
@@ -21,7 +21,9 @@ EXTRA_DIST = \
 	test-virt-diff.sh \
 	virt-diff.pod
 
-CLEANFILES = stamp-virt-diff.pod
+CLEANFILES = \
+	stamp-virt-diff.pod \
+	virt-diff.1
 
 bin_PROGRAMS = virt-diff
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index c49b11e41..a1f80c1e0 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -29,6 +29,14 @@ EXTRA_DIST = \
 	README
 
 CLEANFILES = \
+	guestfs-faq.1 \
+	guestfs-hacking.1 \
+	guestfs-internals.1 \
+	guestfs-performance.1 \
+	guestfs-recipes.1 \
+	guestfs-release-notes.1 \
+	guestfs-security.1 \
+	guestfs-testing.1 \
 	stamp-guestfs-faq.pod \
 	stamp-guestfs-hacking.pod \
 	stamp-guestfs-internals.pod \
diff --git a/edit/Makefile.am b/edit/Makefile.am
index 519b57807..8547ebb88 100644
--- a/edit/Makefile.am
+++ b/edit/Makefile.am
@@ -21,7 +21,9 @@ EXTRA_DIST = \
 	test-virt-edit.sh \
 	virt-edit.pod
 
-CLEANFILES = stamp-virt-edit.pod
+CLEANFILES = \
+	stamp-virt-edit.pod \
+	virt-edit.1
 
 bin_PROGRAMS = virt-edit
 
diff --git a/erlang/Makefile.am b/erlang/Makefile.am
index 5a1658cd0..a9825f60d 100644
--- a/erlang/Makefile.am
+++ b/erlang/Makefile.am
@@ -30,7 +30,13 @@ EXTRA_DIST = \
 
 CLEANFILES = \
 	$(erlang_bin_DATA) \
-	$(bin_PROGRAMS)
+	$(bin_PROGRAMS) \
+	bindtests.tmp
+
+# Erlang makes a new libguestfs-<VERSION>/ebin subdirectory each time
+# we build, so we have to remove that and any previous copies.
+clean-local:
+	rm -rf libguestfs-1.*
 
 if HAVE_ERLANG
 
diff --git a/erlang/examples/Makefile.am b/erlang/examples/Makefile.am
index 22d7a0ee6..0d2a3c922 100644
--- a/erlang/examples/Makefile.am
+++ b/erlang/examples/Makefile.am
@@ -23,7 +23,9 @@ EXTRA_DIST = \
 	inspect_vm.erl \
 	guestfs-erlang.pod
 
-CLEANFILES = stamp-guestfs-erlang.pod
+CLEANFILES = \
+	guestfs-erlang.3 \
+	stamp-guestfs-erlang.pod
 
 man_MANS = guestfs-erlang.3
 noinst_DATA = $(top_builddir)/website/guestfs-erlang.3.html
diff --git a/examples/Makefile.am b/examples/Makefile.am
index a27ce0dde..4ca5d8bd7 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST = \
 	virt-dhcp-address.c
 
 CLEANFILES = \
+	guestfs-examples.3 \
 	stamp-guestfs-examples.pod
 
 noinst_PROGRAMS = create-disk debug-logging display-icon inspect-vm
diff --git a/fish/Makefile.am b/fish/Makefile.am
index 266b7665d..97c242cd2 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -18,12 +18,18 @@
 include $(top_srcdir)/subdir-rules.mk
 
 CLEANFILES = \
+	guestfish.1 \
+	libguestfs-tools.conf.5 \
 	stamp-guestfish.pod \
 	stamp-libguestfs-tools.conf.pod \
 	stamp-virt-copy-in.pod \
 	stamp-virt-copy-out.pod \
 	stamp-virt-tar-in.pod \
-	stamp-virt-tar-out.pod
+	stamp-virt-tar-out.pod \
+	virt-copy-in.1 \
+	virt-copy-out.1 \
+	virt-tar-in.1 \
+	virt-tar-out.1
 
 bin_PROGRAMS = guestfish
 
diff --git a/format/Makefile.am b/format/Makefile.am
index 55204a3ca..b6f7ecfd9 100644
--- a/format/Makefile.am
+++ b/format/Makefile.am
@@ -20,7 +20,9 @@ include $(top_srcdir)/subdir-rules.mk
 EXTRA_DIST = \
 	virt-format.pod
 
-CLEANFILES = stamp-virt-format.pod
+CLEANFILES = \
+	stamp-virt-format.pod \
+	virt-format.1
 
 bin_PROGRAMS = virt-format
 
diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index e0186548a..d0df2a4f3 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -24,6 +24,8 @@ EXTRA_DIST = \
 	test-guestunmount-not-mounted.sh
 
 CLEANFILES = \
+	guestmount.1 \
+	guestunmount.1 \
 	stamp-guestmount.pod \
 	stamp-guestunmount.pod
 
diff --git a/generator/Makefile.am b/generator/Makefile.am
index a3fe50d55..9177e6fdb 100644
--- a/generator/Makefile.am
+++ b/generator/Makefile.am
@@ -154,6 +154,6 @@ stamp-generator: generator
 
 CLEANFILES = $(noinst_DATA) $(noinst_PROGRAM) *.cmi *.cmo *~
 
-DISTCLEANFILES = .depend
+DISTCLEANFILES = .depend .pod2text.data.version.2
 
 SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly
diff --git a/get-kernel/Makefile.am b/get-kernel/Makefile.am
index 8dd1e5941..85428a76b 100644
--- a/get-kernel/Makefile.am
+++ b/get-kernel/Makefile.am
@@ -123,7 +123,9 @@ stamp-virt-get-kernel.pod: virt-get-kernel.pod
 	  $<
 	touch $@
 
-CLEANFILES += stamp-virt-get-kernel.pod
+CLEANFILES += \
+	stamp-virt-get-kernel.pod \
+	virt-get-kernel.1
 
 # Dependencies.
 depend: .depend
diff --git a/golang/examples/Makefile.am b/golang/examples/Makefile.am
index e77e57cd2..0b8286d4a 100644
--- a/golang/examples/Makefile.am
+++ b/golang/examples/Makefile.am
@@ -23,7 +23,9 @@ EXTRA_DIST = \
 	inspect-vm.go \
 	guestfs-golang.pod
 
-CLEANFILES = stamp-guestfs-golang.pod
+CLEANFILES = \
+	guestfs-golang.3 \
+	stamp-guestfs-golang.pod
 
 man_MANS = guestfs-golang.3
 noinst_DATA = $(top_builddir)/website/guestfs-golang.3.html
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 2e0140561..c71f0dbb7 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -44,7 +44,9 @@ EXTRA_DIST = \
 	test-xmllint.sh.in \
 	virt-inspector.pod
 
-CLEANFILES = stamp-virt-inspector.pod
+CLEANFILES = \
+	stamp-virt-inspector.pod \
+	virt-inspector.1
 
 docdir = @docdir@
 dist_doc_DATA = \
diff --git a/java/Makefile.am b/java/Makefile.am
index b56219267..e478c717a 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -56,10 +56,12 @@ EXTRA_DIST = \
 	Makefile.inc
 
 CLEANFILES = \
-	doc-stamp \
+	bindtests.tmp \
 	com/redhat/et/libguestfs/*.class \
 	com_redhat_et_libguestfs_GuestFS.h \
+	doc-stamp \
 	*.class \
+	t/*.class \
 	*.jar
 
 clean-local:
diff --git a/java/examples/Makefile.am b/java/examples/Makefile.am
index 8103318a5..9766d9b32 100644
--- a/java/examples/Makefile.am
+++ b/java/examples/Makefile.am
@@ -25,6 +25,7 @@ EXTRA_DIST = \
 
 CLEANFILES = \
 	*.class \
+	guestfs-java.3 \
 	stamp-guestfs-java.pod
 
 man_MANS = guestfs-java.3
diff --git a/lua/Makefile.am b/lua/Makefile.am
index 2833e20c7..4c01e80b6 100644
--- a/lua/Makefile.am
+++ b/lua/Makefile.am
@@ -27,7 +27,10 @@ EXTRA_DIST = \
 	$(generator_built) \
 	run-bindtests
 
-CLEANFILES = *~ guestfs.so
+CLEANFILES = \
+	*~ \
+	bindtests.tmp \
+	guestfs.so
 
 if HAVE_LUA
 
diff --git a/lua/examples/Makefile.am b/lua/examples/Makefile.am
index 10950012c..dad5793b0 100644
--- a/lua/examples/Makefile.am
+++ b/lua/examples/Makefile.am
@@ -23,7 +23,9 @@ EXTRA_DIST = \
 	inspect_vm.lua \
 	guestfs-lua.pod
 
-CLEANFILES = stamp-guestfs-lua.pod
+CLEANFILES = \
+	guestfs-lua.3 \
+	stamp-guestfs-lua.pod
 
 man_MANS = guestfs-lua.3
 noinst_DATA = $(top_builddir)/website/guestfs-lua.3.html
diff --git a/make-fs/Makefile.am b/make-fs/Makefile.am
index 4ed6e990c..ccc4937e7 100644
--- a/make-fs/Makefile.am
+++ b/make-fs/Makefile.am
@@ -21,7 +21,9 @@ EXTRA_DIST = \
 	test-virt-make-fs.sh \
 	virt-make-fs.pod
 
-CLEANFILES = stamp-virt-make-fs.pod
+CLEANFILES = \
+	stamp-virt-make-fs.pod \
+	virt-make-fs.1
 
 bin_PROGRAMS = virt-make-fs
 
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index ec190e465..b79bcadf2 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = \
 	t/*.ml
 
 CLEANFILES = *.annot *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so
-CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so
+CLEANFILES += t/*.annot t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so
 
 if HAVE_OCAML
 
@@ -100,6 +100,9 @@ noinst_DATA += html/index.html
 html/index.html: $(srcdir)/guestfs.mli $(srcdir)/guestfs.ml
 	-$(OCAMLFIND) ocamldoc -d html -html $^
 
+clean-local:
+	rm -rf html/*
+
 endif
 
 TESTS_ENVIRONMENT = $(top_builddir)/run --test $(VG)
@@ -161,6 +164,8 @@ endif
 check-valgrind:
 	$(MAKE) VG="$(top_builddir)/run @VG@" TESTS="$(test_progs_all)" check
 
+CLEANFILES += bindtests.tmp
+
 # Dependencies.
 %.cmi: %.mli
 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $@
diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am
index 34d60320a..a85b6e5c1 100644
--- a/ocaml/examples/Makefile.am
+++ b/ocaml/examples/Makefile.am
@@ -27,6 +27,7 @@ EXTRA_DIST = \
 CLEANFILES = \
 	$(noinst_SCRIPTS) \
 	*.cmi *.cmo *.cmx *.o \
+	guestfs-ocaml.3 \
 	stamp-guestfs-ocaml.pod
 
 man_MANS = guestfs-ocaml.3
diff --git a/p2v/Makefile.am b/p2v/Makefile.am
index d51324ed7..0fd9ef5aa 100644
--- a/p2v/Makefile.am
+++ b/p2v/Makefile.am
@@ -33,7 +33,10 @@ EXTRA_DIST = \
 CLEANFILES = \
 	stamp-virt-p2v.pod \
 	stamp-virt-p2v-make-disk.pod \
-	stamp-virt-p2v-make-kickstart.pod
+	stamp-virt-p2v-make-kickstart.pod \
+	virt-p2v.1 \
+	virt-p2v-make-disk.1 \
+	virt-p2v-make-kickstart.1
 
 # Although virt-p2v is a regular binary, it is not usually installed
 # in /usr/bin since it only functions when contained in an ISO or PXE
diff --git a/perl/Makefile.am b/perl/Makefile.am
index db6b336e5..ffc11ec10 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -36,6 +36,14 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = Build
 
+# Some files are not removed by './Build clean' below.
+CLEANFILES = \
+	*.o \
+	bindtests.tmp \
+	MYMETA.json \
+	MYMETA.yml \
+	pm_to_blib
+
 # It would be nice to do this, but 'make distclean' runs 'make clean'
 # in parallel, and './Build clean' requires '_build/magicnum' to
 # exist, so you end up deleting a file which is required by the
diff --git a/perl/examples/Makefile.am b/perl/examples/Makefile.am
index 8ccef2556..be3a710cd 100644
--- a/perl/examples/Makefile.am
+++ b/perl/examples/Makefile.am
@@ -23,7 +23,9 @@ EXTRA_DIST = \
 	inspect_vm.pl \
 	guestfs-perl.pod
 
-CLEANFILES = stamp-guestfs-perl.pod
+CLEANFILES = \
+	guestfs-perl.3
+	stamp-guestfs-perl.pod
 
 man_MANS = guestfs-perl.3
 noinst_DATA = $(top_builddir)/website/guestfs-perl.3.html
diff --git a/python/Makefile.am b/python/Makefile.am
index ca3849efc..f198ab464 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -110,7 +110,10 @@ endif HAVE_PYTHON
 
 # Extra clean.
 CLEANFILES = \
-	*~ examples/*~ t/*~ \
+	*~ *.pyc \
+	examples/*~ examples/*.pyc \
+	t/*~ t/*.pyc \
+	bindtests.tmp \
 	config.h \
 	guestfs-internal-all.h \
 	guestfs-internal-frontend-cleanups.h \
diff --git a/python/examples/Makefile.am b/python/examples/Makefile.am
index a9293874d..fac830173 100644
--- a/python/examples/Makefile.am
+++ b/python/examples/Makefile.am
@@ -23,7 +23,11 @@ EXTRA_DIST = \
 	inspect_vm.py \
 	guestfs-python.pod
 
-CLEANFILES = *.pyc *.pyo stamp-guestfs-python.pod
+CLEANFILES = \
+	*.pyc \
+	*.pyo \
+	guestfs-python.3 \
+	stamp-guestfs-python.pod
 
 man_MANS = guestfs-python.3
 noinst_DATA = $(top_builddir)/website/guestfs-python.3.html
diff --git a/rescue/Makefile.am b/rescue/Makefile.am
index 5123eea30..8c5c7f633 100644
--- a/rescue/Makefile.am
+++ b/rescue/Makefile.am
@@ -22,7 +22,9 @@ EXTRA_DIST = \
 	test-virt-rescue-suggest.sh \
 	virt-rescue.pod
 
-CLEANFILES = stamp-virt-rescue.pod
+CLEANFILES = \
+	stamp-virt-rescue.pod \
+	virt-rescue.1
 
 bin_PROGRAMS = virt-rescue
 
diff --git a/resize/Makefile.am b/resize/Makefile.am
index 8150a315b..43cab3749 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -125,7 +125,9 @@ stamp-virt-resize.pod: virt-resize.pod
 	  $<
 	touch $@
 
-CLEANFILES += stamp-virt-resize.pod
+CLEANFILES += \
+	stamp-virt-resize.pod \
+	virt-resize.1
 
 # Tests.
 
diff --git a/ruby/examples/Makefile.am b/ruby/examples/Makefile.am
index 166d6792b..6150b807e 100644
--- a/ruby/examples/Makefile.am
+++ b/ruby/examples/Makefile.am
@@ -23,7 +23,9 @@ EXTRA_DIST = \
 	inspect_vm.rb \
 	guestfs-ruby.pod
 
-CLEANFILES = stamp-guestfs-ruby.pod
+CLEANFILES = \
+	guestfs-ruby.3 \
+	stamp-guestfs-ruby.pod
 
 man_MANS = guestfs-ruby.3
 noinst_DATA = $(top_builddir)/website/guestfs-ruby.3.html
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
index d6780f30c..33f418b5b 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -118,7 +118,9 @@ stamp-virt-sparsify.pod: virt-sparsify.pod
 	  $<
 	touch $@
 
-CLEANFILES += stamp-virt-sparsify.pod
+CLEANFILES += \
+	stamp-virt-sparsify.pod \
+	virt-sparsify.1
 
 # Tests.
 
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
index 99e47f5f9..573483f81 100644
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -27,8 +27,9 @@ EXTRA_DIST = \
 
 CLEANFILES = \
 	*~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o \
-	virt-sysprep virt-sysprep.1 \
-	stamp-virt-sysprep.pod
+	stamp-virt-sysprep.pod \
+	virt-sysprep \
+	virt-sysprep.1
 
 # Filenames sysprep_operation_<name>.ml in alphabetical order.
 operations = \
diff --git a/test-data/files/Makefile.am b/test-data/files/Makefile.am
index 58c2fa079..b873327a5 100644
--- a/test-data/files/Makefile.am
+++ b/test-data/files/Makefile.am
@@ -42,6 +42,8 @@ noinst_DATA = \
 	lib-i586.so.xz \
 	test-grep.txt.gz
 
+CLEANFILES = $(noinst_DATA)
+
 100kallzeroes:
 	rm -f $@ $@-t
 	dd if=/dev/zero of=$@-t bs=1024 count=100
diff --git a/tests/c-api/Makefile.am b/tests/c-api/Makefile.am
index 7bfffe5d3..4163067f3 100644
--- a/tests/c-api/Makefile.am
+++ b/tests/c-api/Makefile.am
@@ -23,6 +23,10 @@ BUILT_SOURCES = $(generator_built)
 
 EXTRA_DIST = $(BUILT_SOURCES)
 
+CLEANFILES = \
+	test.log \
+	testdownload.tmp
+
 check_PROGRAMS = \
 	tests \
 	test-command \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 05b1a7aa5..35174bdb5 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,8 +23,11 @@ tools = \
 	tar \
 	win-reg
 
-# Before 1.23.23, there were symlinks called *.pl.  Need to delete these.
-CLEANFILES = *.pl
+CLEANFILES = \
+	virt-list-filesystems.1 \
+	virt-list-partitions.1 \
+	virt-tar.1 \
+	virt-win-reg.1
 
 EXTRA_DIST = \
 	$(tools:%=virt-%) \
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
index c371249ee..5e02b8391 100644
--- a/v2v/Makefile.am
+++ b/v2v/Makefile.am
@@ -222,7 +222,9 @@ stamp-virt-v2v.pod: virt-v2v.pod
 	  $<
 	touch $@
 
-CLEANFILES += stamp-virt-v2v.pod
+CLEANFILES += \
+	stamp-virt-v2v.pod \
+	virt-v2v.1
 
 # Tests.
 
diff --git a/v2v/test-harness/Makefile.am b/v2v/test-harness/Makefile.am
index 9513da167..2553c9fcc 100644
--- a/v2v/test-harness/Makefile.am
+++ b/v2v/test-harness/Makefile.am
@@ -24,7 +24,16 @@ EXTRA_DIST = \
 	$(SOURCES_MLI) $(SOURCES_ML) \
 	virt-v2v-test-harness.pod
 
-CLEANFILES = *~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o
+CLEANFILES = \
+	*~ \
+	*.a \
+	*.annot \
+	*.cmi \
+	*.cmo \
+	*.cmx \
+	*.cmxa \
+	*.o \
+	*.so
 
 SOURCES_MLI = \
 	v2v_test_harness.mli
@@ -137,7 +146,9 @@ stamp-virt-v2v-test-harness.pod: virt-v2v-test-harness.pod
 	  $<
 	touch $@
 
-CLEANFILES += stamp-virt-v2v-test-harness.pod
+CLEANFILES += \
+	stamp-virt-v2v-test-harness.pod \
+	virt-v2v-test-harness.1
 
 # Dependencies.
 depend: .depend