diff --git a/.gitignore b/.gitignore
index a08e3e3865..490fbb296f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,6 +109,7 @@ galaxy
 # tags
 
 TAGS
+tags
 cscope.*
 
 # emacs
@@ -117,6 +118,9 @@ cscope.*
 \#*#
 src/.dir-locals.el
 
+# vim
+*.swp
+
 # eclipse
 
 .cproject