diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 530c0d8e78..bcddefb711 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-22 00:17 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fix to -mwindow/-mconsole switch handling for MinGW.
+
 2009-02-21 22:11 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   + contrib/examples/dbu/dbu.hbm
   - contrib/examples/dbu/hbmk.bat
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 378be58d12..e0845ae13f 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1018,7 +1018,9 @@ FUNCTION Main( ... )
          cLibPathPrefix := "-L"
          cLibPathSep := " "
          IF s_lGUI
-            cOpt_CompC += " -Wl,-mwindows"
+            cOpt_CompC += " -mwindows"
+         ELSE
+            cOpt_CompC += " -mconsole"
          ENDIF
          IF s_lMAP
             cOpt_CompC += " -Wl,-Map " + s_cMAPNAME