diff --git a/.gitattributes b/.gitattributes
index bdb0cab..45e6003 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,17 +1,17 @@
-# Auto detect text files and perform LF normalization
+# Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
 
-# Custom for Visual Studio
-*.cs     diff=csharp
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.pas text
+*.dfm text
+*.md text
+*.txt text
+*.java text
+*.cs text
 
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+# Declare files that will always have CRLF line endings on checkout.
+
+# Denote all files that are truly binary and should not be modified.
+*.exe binary
+*.res binary