diff --git a/Makefile.am b/Makefile.am
index ccd3358..87129f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ log:
 	@echo "melkins:'Michael Elkins <me@sigpipe.org>'" >> .usermap
 	@echo "ossi:'Oswald Buddenhagen <ossi@users.sf.net>'" >> .usermap
 	cvs2cl -U .usermap --no-wrap --separate-header
-	@rm .usermap
+	@rm -f .usermap ChangeLog.bak
 
 rpm:
 	make dist
diff --git a/debian/Makefile.am b/debian/Makefile.am
index 3f3272c..1d3fb1c 100644
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -1,5 +1,5 @@
-EXTRA_DIST=docs rules control copyright changelog
-DISTCLEANFILES=files *.debhelper
+EXTRA_DIST = changelog compat control copyright dirs docs rules
+DISTCLEANFILES = files isync.substvars
 
 distclean-local:
 	rm -rf isync