diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b8e6ffc1c9..0cf404dd36 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-06-09 17:27 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/make.hb
+    % use $d in hb_strformat() instead of calling hb_ntos()
+    ! switched to UTF8EX to be in sync with hbmk2
+
+  * utils/hbmk2/hbmk2.prg
+    ! fixed nasty regression caused by old problem where --hbinfo
+      output might have contained other information. Now hbmk2
+      makes sure to keep -info disabled and -quiet enabled when
+      in --hbinfo mode
+
 2012-06-08 20:04 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/hbmzip/3rd/minizip/minizip.dif
     * minor correction
diff --git a/harbour/contrib/make.hb b/harbour/contrib/make.hb
index c454bb05d1..2388a856d9 100755
--- a/harbour/contrib/make.hb
+++ b/harbour/contrib/make.hb
@@ -68,6 +68,8 @@ PROCEDURE Main( ... )
    LOCAL hProjectList
    LOCAL aParams
 
+   hb_cdpSelect( "UTF8EX" )
+
    s_cBase := ""
    s_cReBase := ""
    IF Empty( GetEnv( "HB_HOST_BIN_DIR" ) )
@@ -196,7 +198,7 @@ PROCEDURE Standalone( aParams, hProjectList )
       IF Empty( hProjectReqList )
          lCustom := .T.
       ELSE
-         OutStd( hb_StrFormat( "! Package %1$s... %2$s project(s)", hActions[ nAction ], hb_ntos( Len( hProjectReqList ) ) ) + hb_eol() )
+         OutStd( hb_StrFormat( "! Package %1$s... %2$d project(s)", hActions[ nAction ], Len( hProjectReqList ) ) + hb_eol() )
       ENDIF
    ENDIF
 
@@ -387,7 +389,7 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption
    /* Preprocessing */
 
    IF Len( hProjectReqList ) > 1
-      OutStd( hb_StrFormat( "! Calculating build order for %1$s projects...", hb_ntos( Len( hProjectReqList ) ) ) + hb_eol() )
+      OutStd( hb_StrFormat( "! Calculating build order for %1$d projects...", Len( hProjectReqList ) ) + hb_eol() )
    ENDIF
 
    aPairList := {}
@@ -399,7 +401,7 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption
 
    aSortedList := TopoSort( aPairList )
 
-   /* Add referenced project not present on our list and featuring an .hbp file */
+   /* Add referenced project not present in our list and featuring an .hbp file */
    FOR EACH cProject IN aSortedList
       IF !( cProject $ hProjectList )
          IF hb_FileExists( s_cBase + s_cHome + cProject )
@@ -570,7 +572,7 @@ STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, cDynSuffix, cStdErr, cStd
    ENDIF
 
    IF nErrorLevel != 0
-      OutStd( hb_StrFormat( "! '%1$s' returned status: %2$s", cProjectPath, hb_ntos( nErrorLevel ) ) + hb_eol() )
+      OutStd( hb_StrFormat( "! '%1$s' returned status: %2$d", cProjectPath, nErrorLevel ) + hb_eol() )
    ENDIF
 
    RETURN nErrorLevel
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 0b11de7d28..74ab2816a0 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -96,8 +96,6 @@
          writing, most of them has one created.
          Thank you. [vszakats] */
 
-/* TODO: Switch to UTF8EX codepage internally. (non-priority) */
-
 /* TODO: Support debug/release modes. Some default setting can be set
          accordingly, and user can use it to further tweak settings. */
 /* TODO: Further clean hbmk context var usage (global scope, project scope,
@@ -2191,8 +2189,18 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
          /* Simply ignore. They were already processed in the first pass. */
 
       CASE cParamL == "-quiet"           ; hbmk[ _HBMK_lQuiet ] := .T. ; hbmk[ _HBMK_lInfo ] := .F.
-      CASE cParamL == "-quiet-"          ; hbmk[ _HBMK_lQuiet ] := .F.
-      CASE cParamL == "-info"            ; hbmk[ _HBMK_lInfo ] := .T.
+      CASE cParamL == "-quiet-"
+
+         IF ! lDumpInfo
+            hbmk[ _HBMK_lQuiet ] := .F.
+         ENDIF
+
+      CASE cParamL == "-info"
+
+         IF ! lDumpInfo
+            hbmk[ _HBMK_lInfo ] := .T.
+         ENDIF
+
       CASE cParamL == "-pause"           ; lPause := .T.
       CASE cParamL == "-hbexe"
 
@@ -2436,6 +2444,9 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 
          lDumpInfo := .T.
 
+         hbmk[ _HBMK_lQuiet ] := .T.
+         hbmk[ _HBMK_lInfo ] := .F.
+
       CASE Left( cParamL, Len( "-jobs=" ) ) == "-jobs="
 
          cParam := SubStr( cParam, Len( "-jobs=" ) + 1 )