diff --git a/.gitattributes b/.gitattributes
index 5e8f630ba..c1789ac37 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,3 +9,12 @@
 /docs/** linguist-documentation
 /docs/analytics/** -linguist-documentation
 /website/** linguist-documentation
+
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.cpp text
+*.h text
+*.pot