diff --git a/.gitattributes b/.gitattributes
index 70ceaf342..3c0e9dfc0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,6 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
 # Text files
 *.txt text
 *.xml text