diff --git a/.gitattributes b/.gitattributes
index 4d86664e43f..d3bd1519a01 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,10 +1,12 @@
 # Set default behaviour, in case users don't have core.autocrlf set.
+# More info: https://help.github.com/articles/dealing-with-line-endings
 * text=auto
 
 
 # Explicitly declare text files we want to always be normalized and converted 
 # to native line endings on checkout.
 *.php text eol=lf
+*.pl text eol=lf
 *.sql text eol=lf
 *.htm text eol=lf
 *.html text eol=lf
@@ -15,8 +17,12 @@
 *.md text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
+*.bmp binary
 *.ico binary
 *.png binary
 *.jpg binary
 *.odt binary
 *.odf binary
+*.frm binary
+*.MYD binary
+*.MYI binary
diff --git a/build/exe/doliwamp/UsedPort.cpp b/build/exe/doliwamp/UsedPort.cpp
index 45fb5423b5f..15d2978b3bb 100644
--- a/build/exe/doliwamp/UsedPort.cpp
+++ b/build/exe/doliwamp/UsedPort.cpp
@@ -10,8 +10,8 @@
 //---------------------------------------------------------------------------
 // 06/09/09	1.0		Laurent Destailleur	   Creation
 //---------------------------------------------------------------------------
-#define PROG	"UsedPort"
-#define VERSION	"1.0"
+#define PROG	 "UsedPort"
+#define VERSION "1.0"
 
 // If GNU GCC CYGWIN: _WIN32 to defined manually,  __GNUC__ is defined,     _MSC_VER not defined
 // If GNU GCC MINGW:  _WIN32 automaticaly defined, __GNUC__ is defined,     _MSC_VER not defined