diff --git a/.gitignore b/.gitignore
index 39136062..d96ce3fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,5 @@ util/startfluxbox
 version.h
 install-sh
 missing
+*~
+.*.swp