diff --git a/.gitattributes b/.gitattributes
index 73c989a7e..de1ad82c8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,15 @@
 # .gitattributes
+
 # prevent binary files from CRLF handling, diff and merge:
 fpga/fpga.bit -crlf -diff
 *.bin -crlf -diff
 *.z -crlf -diff
+
 # Force LF
 *.c text=auto eol=lf
+*.cpp text=auto eol=lf
 *.h text=auto eol=lf
 *.lua text=auto eol=lf
+*.py text=auto eol=lf
+*.pl text=auto eol=lf
+Makefile text=auto eol=lf
diff --git a/Makefile b/Makefile
index 327d1ab6d..2ad01ba5f 100644
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,7 @@ style:
 	@which astyle >/dev/null || ( echo "Please install 'astyle' package first" ; exit 1 )
 	# Remove spaces & tabs at EOL, add LF at EOF if needed on *.c, *.h, *.cpp. *.lua, *.py, *.pl, Makefile
 	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "*.py" -or -name "*.pl" -or -name "Makefile" \) \
-	    -exec perl -pi -e 's/[ \t\r]+$$//' {} \; \
+	    -exec perl -pi -e 's/[ \t]+$$//' {} \; \
 	    -exec sh -c "tail -c1 {} | xxd -p | tail -1 | grep -q -v 0a$$" \; \
 	    -exec sh -c "echo >> {}" \;
 	# Apply astyle on *.c, *.h, *.cpp