diff --git a/.gitignore b/.gitignore
index c7e72545bf6..65c584d143a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,5 @@ nosetests.xml
 
 # Hide emacs backups
 *~
+*#
+*.orig