diff --git a/.gitattributes b/.gitattributes
index 412eeda78dc..dfd725df410 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,14 +1,6 @@
 # Auto detect text files and perform LF normalization
 * text=auto
 
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
 # Standard to msysgit
 *.doc	 diff=astextplain
 *.DOC	 diff=astextplain
@@ -20,3 +12,25 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+# Images
+*.png binary
+*.gif binary
+*.bmp binary
+*.tiff binary
+*.tif binary
+*.jpeg binary
+*.jpg binary
+
+# Misc binary
+*.zip binary
+*.mef binary
+*.jks binary
+*.db binary
+
+# Related to font files
+*.ttf binary
+*.eot binary
+*.woff binary
+
+*.xsd text eol=lf