diff --git a/harbour/.gitattributes b/harbour/.gitattributes
new file mode 100644
index 0000000000..5f10a6e8b6
--- /dev/null
+++ b/harbour/.gitattributes
@@ -0,0 +1,72 @@
+# Default
+*         text=auto
+
+# These files are text and should be normalized (convert CRLF => LF)
+*.1       text
+*.api     text
+*.bas     text
+*.c       text
+*.cfg     text
+*.cfm     text
+*.ch      text
+*.css     text
+*.def     text
+*.dif     text
+*.h       text
+*.hb      text
+*.hbc     text
+*.hbm     text
+*.hbp     text
+*.hbx     text
+*.htm     text
+*.html    text
+*.in      text
+*.ini     text
+*.js      text
+*.m       text
+*.mft     text
+*.mk      text
+*.nsi     text
+*.pem     text
+*.po      text
+*.prg     text
+*.rb      text
+*.rc      text
+*.sfc     text
+*.spec    text
+*.sx      text
+*.tpl     text
+*.txt     text
+*.vbs     text
+*.xml     text
+*.xsl     text
+*.y       text
+*.yyc     text
+*.yyh     text
+
+# Text files with fixed EOL requirements
+*.bat     eol=crlf
+*.sh      eol=lf
+
+# Binary files
+*.a       binary
+*.afm     binary
+*.bmp     binary
+*.dat     binary
+*.dbf     binary
+*.exe     binary
+*.frm     binary
+*.gif     binary
+*.icns    binary
+*.ico     binary
+*.jpg     binary
+*.lbl     binary
+*.lib     binary
+*.mdb     binary
+*.ng      binary
+*.odt     binary
+*.pdf     binary
+*.pfb     binary
+*.png     binary
+*.sq3     binary
+*.tif     binary
diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5248a55155..a2104bc51b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-08 15:49 UTC+0200 Viktor Szakats (harbour syenar.net)
+  + .gitattributes
+    + added config file to setup EOL handling in a git repo
+
 2012-10-08 15:28 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/hbmlzo/3rd/minilzo/minilzo.hbp
   - contrib/hbmlzo/3rd/minilzo/README.LZO