diff --git a/.gitattributes b/.gitattributes
index 412eeda7..2af4f312 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,3 +20,14 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+ These files are text and should be normalized (Convert crlf => lf)
+*.java text
+*.xml text
+*.txt text
+
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.jar binary
+*.so binary
+*.dll binary