diff --git a/.gitignore b/.gitignore
index 0a642e562..f16a1f9a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,8 @@ docs/_build
 
 # Vim cruft
 .*.swp
+
+#emacs
+*~
+\#*#
+.#*