diff --git a/.gitignore b/.gitignore
index b653cb06c..48ec7910b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,9 +17,11 @@ letsencrypt-auto-source/letsencrypt-auto.sig.lzma.base64
 
 /.vagrant
 
+tags
+
 # editor temporary files
 *~
-*.swp
+*.sw?
 \#*#
 .idea