diff --git a/.gitignore b/.gitignore
index ee71398e44..f5169a5405 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,9 +20,10 @@
 *.swp
 /htmlcov
 .coverage
-#*
+\#*
 .#*
 lib/spack/spack/test/.cache
 /bin/spackc
 *.in.log
 *.out.log
+*.orig