diff --git a/.gitignore b/.gitignore
index bbbec2432..8883a445b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,6 +77,10 @@ gmon.out
 *.pydevproject
 *.launch
 
+# Emacs
+\#*\#
+.\#*
+
 # GCOV code coverage
 *.gcno
 *.gcda