diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e9a3338b40..335f5bf342 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-16 08:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + If HB_COMPILER is mingw/mingw64/pocc64, architecture
+      will automatically be win, regardless of the platform
+      hbmk2 is run on.
+
 2009-06-16 00:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed to always turn off -mt mode for dos targets.
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 206c27a1b4..8d8cfbd2b8 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -818,12 +818,15 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
                which are supported on one architecture only. In the future this
                should be automatically extracted from a comp/arch matrix. */
       SWITCH hbmk[ _HBMK_cCOMP ]
+      CASE "mingw"
+      CASE "mingw64"
       CASE "msvc"
       CASE "msvc64"
       CASE "msvcia64"
       CASE "bcc"
       CASE "xcc"
       CASE "pocc"
+      CASE "pocc64"
          hbmk[ _HBMK_cARCH ] := "win"
          EXIT
       CASE "mingwarm"
@@ -6149,8 +6152,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       I_( "Supported <comp> values for each supported <arch> value:" ),;
       "  - linux  : gcc, watcom, icc",;
       "  - darwin : gcc",;
-      "  - win    : mingw, msvc, bcc, watcom, icc, pocc, cygwin,",;
-      "  -          mingw64, msvc64, msvcia64, iccia64, pocc64, xcc",;
+      "  - win    : mingw, msvc, bcc, watcom, icc, pocc, cygwin, xcc,",;
+      "  -          mingw64, msvc64, msvcia64, iccia64, pocc64",;
       "  - wce    : mingwarm, msvcarm, poccarm",;
       "  - os2    : gcc, watcom",;
       "  - dos    : djgpp, watcom",;