diff --git a/.gitattributes b/.gitattributes
index f4fc69cb2..b7d98e49d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,12 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
+
+# Files which should always be normalized and converted
+# to native line endings on checkout.
 *.java text
 *.pde text
+
+# Files that will always have CRLF line endings on checkout.
+*.bat eol=crlf
+build/macosx/jAppleMenuBar.url eol=crlf
+