diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index ae43c11342..fc5a4820d0 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,13 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-12-17 18:35 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    ! hbshell_DirBase()/hbshell_ProgName() fixed to
+      return proper non-ASCII chars (= if hbrun/hbmk2 resides
+      in a directory with non-ASCII chars) even if the .hb
+      script or a shell command had changed the default codepage.
+
 2012-12-16 19:04 UTC+0100 Viktor Szakats (harbour syenar.net)
   * include/hbdefs.h
     - deleted redundant type: 'HB_FUNC_PTR'
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 8913814cd2..b69416021b 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -12902,13 +12902,15 @@ STATIC PROCEDURE __hbshell( cFile, ... )
    LOCAL hHRB
    LOCAL cVersion
 
-   s_cDirBase_hbshell := hb_DirBase()
-   s_cProgName_hbshell := hb_ProgName()
-
    /* Set CP and language */
 
    SetUILang( GetUILang() )
 
+   /* Save originals */
+
+   s_cDirBase_hbshell := hb_DirBase()
+   s_cProgName_hbshell := hb_ProgName()
+
    /* Detect Harbour dir layout */
 
    hbmk := s_hbmk := hbmk_new()
@@ -13987,8 +13989,8 @@ STATIC FUNCTION __hbshell_TryHeader( cName )
    BEGIN SEQUENCE WITH {| oErr | Break( oErr ) }
 
       IF ! Empty( hb_compileFromBuf( "", hbmk_CoreHeaderFiles(), hb_ProgName(), "-q2", ;
-                "-i" + s_hbmk[ _HBMK_cHB_INSTALL_INC ], ;
-                "-u+" + cName ) )
+                                     "-i" + s_hbmk[ _HBMK_cHB_INSTALL_INC ], ;
+                                     "-u+" + cName ) )
          lRetVal := .T.
       ENDIF
 
@@ -14027,10 +14029,10 @@ PROCEDURE hbshell_include_list()
 
 /* Public hbshell API */
 FUNCTION hbshell_DirBase()
-   RETURN s_cDirBase_hbshell
+   RETURN hb_UTF8ToStr( s_cDirBase_hbshell )
 
 FUNCTION hbshell_ProgName()
-   RETURN s_cProgName_hbshell
+   RETURN hb_UTF8ToStr( s_cProgName_hbshell )
 
 FUNCTION hbshell_gtSelect( cGT )