diff --git a/Makefile b/Makefile
index fc9d73ba1a..6a02252c3d 100644
--- a/Makefile
+++ b/Makefile
@@ -40,10 +40,13 @@ clean:
 	find . -regex ".*\.py[co]$$" -delete
 	@echo "Cleaning up editor backup files"
 	find . -type f \( -name "*~" -or -name "#*" \) -delete
+	find . -type f \( -name "*.swp" \) -delete
 	@echo "Cleaning up asciidoc to man transformations and results"
 	find ./docs/man -type f \( -name "*.xml" -or -regex ".*\.[0-9]$$" \) -delete
 	@echo "Cleaning up output from test runs"
 	-rm -rf test/test_data
+	@echo "Cleaning up RPM stuff"
+	-rm MANIFEST
 
 python: docs
 	python setup.py build