diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..a5d9c6403
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.scala text
+*.java text