diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 04b6f74ddf..5abebff700 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-22 18:32 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed to only add -march/-mtune gcc parameters for mingw/gcc
+      targets. These values are ignored by mingwarm on Windows, but
+      generate errors on Linux.
+
+  * contrib/hbfimage/fi_winfu.c
+    + FI_WINDRAW() now accepts pointer type as second parameter.
+    ! FI_WINDRAW() fixed warning with gcc 4.4.0.
+
 2009-05-22 17:31 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed to use hb_osPathSeparator() instead of hardcoded
diff --git a/harbour/contrib/hbfimage/fi_winfu.c b/harbour/contrib/hbfimage/fi_winfu.c
index 78abbe096f..21a8d1b4f7 100644
--- a/harbour/contrib/hbfimage/fi_winfu.c
+++ b/harbour/contrib/hbfimage/fi_winfu.c
@@ -178,7 +178,7 @@ HB_FUNC( FI_WINDRAW )
 
       /* Retrieve parameters */
       dib  = ( FIBITMAP * ) hb_parptr( 1 );
-      hDC  = ( HDC ) hb_parnint( 2 );
+      hDC  = HB_ISNUM( 2 ) ? ( HDC ) ( HB_PTRUINT ) hb_parnint( 2 ) : ( HDC ) hb_parptr( 2 );
       rcDest.top    = hb_parni( 3 );
       rcDest.left   = hb_parni( 4 );
       rcDest.bottom = hb_parni( 5 );
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index deabbed99e..106ed324e1 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1926,7 +1926,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          cOpt_CompC := "-c"
          IF hbmk[ _HBMK_lOPTIM ]
             cOpt_CompC += " -O3"
-            IF !( hbmk[ _HBMK_cCOMP ] == "cygwin" )
+            IF hbmk[ _HBMK_cCOMP ] $ "gcc|mingw"
                cOpt_CompC += " -march=i586 -mtune=pentiumpro"
             ENDIF
             IF ! hbmk[ _HBMK_lDEBUG ]