diff --git a/.gitattributes b/.gitattributes
index 9fa544d91a..15410b16b4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,4 +13,5 @@
 *.txt        whitespace=trailing-space,space-before-tab,cr-at-eol
 
 # special files which must ignore whitespace
-*.patch      whitespace=-trailing-space
+*.patch      whitespace=-trailing-space eol=lf
+*.diff       whitespace=-trailing-space eol=lf