diff --git a/.gitignore b/.gitignore
index 367caa66..8417d60f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@ TAGS
 notmuch
 notmuch.1.gz
 *.[ao]
+*~
+.*.swp