diff --git a/.gitignore b/.gitignore
index 619e6e04660..267a829d951 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,6 +131,10 @@ cppcheck-cppcheck-build-dir/
 *.pydevproject
 *.launch
 
+# Emacs
+\#*\#
+.\#*
+
 # GCOV code coverage
 *.gcda
 *.gcno