diff --git a/.gitignore b/.gitignore
index 31d4d847d..6d4bab7dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -168,6 +168,10 @@ venv
 # Vim
 .*.swp
 *.swp
+tags
+
+# Emacs
+.#*
 
 # tools
 tools/prometheus*