diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 33b301d19c..856646791a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-08 18:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Possible fix to -hbdyn in -xhb mode.
+    ! Fix to -hbdyn in -hb10 mode.
+
 2009-06-08 18:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     % Removed section dealing with GNU Make configuration on Windows.
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 089abc33fd..d0ecb5a5b6 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2782,12 +2782,11 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       ENDCASE
 
       IF lCreateDyn .AND. hbmk[ _HBMK_cARCH ] $ "win|wce"
-         IF hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB
+         IF hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB .OR. ;
+            hbmk[ _HBMK_nHBMODE ] == _HBMODE_HB10
             AAdd( hbmk[ _HBMK_aOPTC ], "-D__EXPORT__" )
-            AAdd( aLIB_BASE1, "dllmain" ) /* TOFIX */
          ELSE
             AAdd( hbmk[ _HBMK_aOPTC ], "-DHB_DYNLIB" )
-            /* AAdd( aLIB_BASE1, "hbmaindllp" ) */
          ENDIF
       ENDIF
    ENDIF