diff --git a/.gitattributes b/.gitattributes
index 8160610a..18f17680 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,46 +1,25 @@
-#######################################
-## Configure line endings
-
-# Use LF by default.
-* text eol=lf
+* text=auto
 
 # Use CRLF for certain Windows files.
-*.vcproj text eol=crlf
-*.sln text eol=crlf
-*.nsi text eol=crlf
-*.bat text eol=crlf
-README-WINDOWS.txt text eol=crlf
-windows/package-info.json text eol=crlf
-windows/resources/resource.h text eol=crlf
-windows/resources/nzbget.rc text eol=crlf
+*.vcproj                        eol=crlf
+*.sln                           eol=crlf
+*.bat                           eol=crlf
+README-WINDOWS.txt              eol=crlf
+nzbget-setup.nsi                eol=crlf
+windows/package-info.json       eol=crlf
+windows/resources/resource.h    eol=crlf
+windows/resources/nzbget.rc     eol=crlf
 
-# Denote all files that are truly binary and should not be modified.
-*.png binary
-*.jpg binary
-*.jpeg binary
-*.gif binary
-*.ico binary
-*.bmp binary
-*.icns binary
-*.rtf binary
-
-# Inherited stuff
-lib/par2/README text eol=crlf
-
-#######################################
-## Configure GitHub's language detector
-
-lib/* linguist-vendored linguist-language=C++
-webui/lib/* linguist-vendored
-
-Makefile.in linguist-vendored
-configure linguist-vendored
-config.sub linguist-vendored
-aclocal.m4 linguist-vendored
-config.guess linguist-vendored
-depcomp linguist-vendored
-install-sh linguist-vendored
-missing linguist-vendored
-
-configure.ac linguist-vendored=false
-Makefile.am linguist-vendored=false
+# Configure GitHub's language detector
+lib/*               linguist-vendored linguist-language=C++
+webui/lib/*         linguist-vendored
+Makefile.in         linguist-vendored
+configure           linguist-vendored
+config.sub          linguist-vendored
+aclocal.m4          linguist-vendored
+config.guess        linguist-vendored
+depcomp             linguist-vendored
+install-sh          linguist-vendored
+missing             linguist-vendored
+configure.ac        linguist-vendored=false
+Makefile.am         linguist-vendored=false