diff --git a/.gitignore b/.gitignore
index d57bdee03..fbbc7a3e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 # Exclude all hidden files
 .*
-# But not .gitignore, .vagrant-puppet, .htaccess and .gitkeep
+# But not .gitignore, .gitattributes, .vagrant-puppet, .htaccess and .gitkeep
 !.gitignore
+!.gitattributes
 !.vagrant-puppet
 !public/.htaccess
 !public/.htaccess.in
diff --git a/.vagrant-puppet/.gitattributes b/.vagrant-puppet/.gitattributes
new file mode 100644
index 000000000..af67531d8
--- /dev/null
+++ b/.vagrant-puppet/.gitattributes
@@ -0,0 +1 @@
+* -crlf