diff --git a/Makefile.am b/Makefile.am
index 04d85d2ee1fbc94a9c503f9867d2c0240e3e4630..f1e842a320d8cd756dc40df7c28c4fa4f0006c85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,8 +103,12 @@ dist-hook:
 	rm -rf `find $(distdir) -name .svn -a -type d`
 	@echo Deleting CVS directories in $(distdir)
 	rm -rf `find $(distdir) -name CVS`
-	@echo Deleting .cvsignore file in $(distdir)
+	@echo Deleting .cvsignore files in $(distdir)
 	rm -f `find $(distdir) -name '.cvsignore'`
+	@echo Deleting backup files in $(distdir)
+	rm -f `find $(distdir) -name '*~'`
+	@echo Deleting stale lock-files in $(distdir)
+	rm -f `find $(distdir) -name '.#*'`
 
 #
 # NOTE: you better have GRAPE installed properly before doing this.