diff --git a/.gitattributes b/.gitattributes
index 69fe7b106d..213be894e5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,6 +11,7 @@
 *.h                     text eol=lf
 *.rc                    text eol=lf
 *.php                   text eol=lf
+*.xpm                   text eol=lf
 
 # Project files
 #
@@ -27,3 +28,14 @@
 checkin_notes           text eol=lf
 checkin_notes_2012      text eol=lf
 
+# Misc files
+#
+*.txt                   text eol=lf
+*.xml                   text eol=lf
+*.bat                   text eol=crlf
+*.po                    text eol=lf
+*.log                   text eol=lf
+*.cmd                   text eol=crlf
+*.rtf                   text eol=lf
+*.rul                   text eol=crlf
+*.rules                 text eol=crlf