diff --git a/.gitignore b/.gitignore
index 3c6f279a9c4..51b6f66dca9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,6 +132,10 @@ cppcheck-cppcheck-build-dir/
 *.pydevproject
 *.launch
 
+# Emacs
+\#*\#
+.\#*
+
 # GCOV code coverage
 *.gcda
 *.gcno