diff --git a/.gitattributes b/.gitattributes
index d1002263778..de9ce3303a9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,12 +11,14 @@
 *.htm text eol=lf
 *.html text eol=lf
 *.js text eol=lf
+*.json text eol=lf
 *.css text eol=lf
 *.lang text eol=lf
 *.txt text eol=lf
 *.md text eol=lf
 *.pp text eol=lf
 *.sh text eol=lf
+*.yml text eol=lf
 *.yaml text eol=lf
 *.conf text eol=lf
 
@@ -24,15 +26,16 @@
 
 # Denote all files that are truly binary and should not be modified.
 *.bmp binary
-*.ico binary
-*.png binary
-*.jpg binary
-*.jpeg binary
-*.odt binary
-*.odf binary
 *.frm binary
+*.ico binary
+*.jpeg binary
+*.jpg binary
 *.MYD binary
 *.MYI binary
+*.odf binary
+*.odt binary
+*.png binary
+
 
 # Export ignores to generate clean production tarballs
 /build              export-ignore