diff --git a/doc/Makefile.am b/doc/Makefile.am
index e20940d..85af812 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -119,3 +119,9 @@
 
 draft-zebra-00.txt: draft-zebra-00.ms
 	groff -T ascii -ms $< > $@
+
+DISTCLEANFILES = quagga.info*
+
+# do nothing for DVI, so we don't have to generate or distribute EPS
+# figures
+dvi: # nothing
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 16c9e4c..b13e903 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -43,6 +43,8 @@
 		> test-commands-defun.c
 
 BUILT_SOURCES = test-commands-defun.c
+CLEANFILES = test-commands-defun.c bgpd libzebra
+
 noinst_HEADERS = prng.h tests.h common-cli.h
 
 testcli_SOURCES = test-cli.c common-cli.c