diff --git a/.gitattributes b/.gitattributes
index c30fccabf..880b12415 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,11 +7,34 @@
 # *.h text
 
 # Declare files that will always have CRLF line endings on checkout.
-*.py text eol=crlf
+# Source files
+# ============
+*.pxd		text eol=crlf
+*.py 		text eol=crlf
+*.py3 		text eol=crlf
+*.pyw 		text eol=crlf
+*.pyx  		text eol=crlf
+
 
 # Denote all files that are truly binary and should not be modified.
+# Binary files
+# ============
+*.db		binary
+*.p 		binary
+*.pkl 		binary
+*.pyc 		binary
+*.pyd		binary
+*.pyo 		binary
+
+# Note: .db, .p, and .pkl files are associated
+# with the python modules ``pickle``, ``dbm.*``,
+# ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
+# (among others).
+
+# Denote all files that are truly binary and should not be modified.
+# Image files
+# ============
 *.png binary
 *.jpg binary
 *.icns binary
 *.ico binary
-*.db binary