diff --git a/.gitattributes b/.gitattributes
index 1d90ec757b..ff07ee43ac 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -73,3 +73,11 @@ ChangeLog.txt ident
 *.png     binary
 *.sq3     binary
 *.tif     binary
+
+# TOTEST:
+#*.c       text diff=cpp
+#*.h       text diff=cpp
+#*.htm     text diff=html
+#*.html    text diff=html
+#*.m       text diff=objc
+#*.rb      text diff=ruby
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 60dd9b7e2d..b0af4cb79c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,19 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-04-01 00:17 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    + will now use UTF-8 when the stdout is redirected to file
+      (caveat: will also use UTF-8 when using Windows tools
+      like 'more' do not understand UTF-8)
+    + will now use UTF-8 when using -viewhelp to open the help in viewer
+
+  * README.md
+    * minor clarification to formatting cmd templates
+
+  * .gitattributes
+    + some lines for future testing
+
 2013-03-31 22:52 UTC+0200 Viktor Szakats (harbour syenar.net)
   * include/harbour.hbx
   * src/rtl/hbi18n2.prg
diff --git a/README.md b/README.md
index f31a64de83..80e2b0a668 100644
--- a/README.md
+++ b/README.md
@@ -60,8 +60,8 @@ There are several ways to help making Harbour better:
   the files you're patching. The easiest way to achieve this
   is to use these commands to format your sources:
 
-        $ uncrustify -c <harbour_dir>/bin/harbour.ucf <file.c|.h>
-        $ <harbour_dir>/bin/hbformat <file.prg|.hb|.ch>
+        $ uncrustify -c <harbour_dir>/bin/harbour.ucf <source(.c|.h)>
+        $ <harbour_dir>/bin/hbformat <source(.prg|.hb|.ch)>
 
 - Text editor setting for Harbour files
   - Encoding is either 7-bit ASCII or UTF-8 (without [BOM](https://en.wikipedia.org/wiki/Byte_order_mark))
diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg
index d52d106f96..46b6b96716 100644
--- a/utils/hbmk2/hbmk2.prg
+++ b/utils/hbmk2/hbmk2.prg
@@ -1017,7 +1017,7 @@ STATIC FUNCTION hbmk_new( lShellMode )
    hbmk[ _HBMK_lSysLoc ] := .F.
    hbmk[ _HBMK_lDumpInfo ] := .F.
    hbmk[ _HBMK_lMarkdown ] := .F.
-   hbmk[ _HBMK_bOut ] := {| cText | OutStd( cText ) }
+   hbmk[ _HBMK_bOut ] := @OutStd()
 
    RETURN hbmk
 
@@ -15613,6 +15613,9 @@ STATIC PROCEDURE ShowHeader( hbmk )
       hb_SetTermCP( "UTF8EX" ) /* UTF-8 output for Markdown */
       cText := ToMarkdown( cText )
    ELSE
+      IF ! hb_FIsDevice( 1 /* stdout */ ) .OR. HB_ISBLOCK( hbmk[ _HBMK_bOut ] )
+         hb_SetTermCP( "UTF8EX" ) /* UTF-8 output when redirected or directly writing to file */
+      ENDIF
       cText := StrTran( cText, e"\n", _OUT_EOL )
    ENDIF
    Eval( hbmk[ _HBMK_bOut ], cText )