diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 45d93412f5..f8f8682c6d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,24 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-09 14:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    * Synced HB_DYNLIB handling with GNU Make. This means
+      that from now on hbmk2 won't use -DHB_DYNDLL C compiler
+      switch in -hbdyn mode for mingw/cygwin compilers.
+
+  * ChangeLog
+    * Updated status of some TODO/TOFIX entries.
+
+  * contrib/rddsql/sddodbc/tests/sddodbc.hbc
+    + Added odbc32 to lib list for win platform.
+
+  * utils/hbmk2/hbmk2.hbp
+  * utils/hbrun/hbrun.hbp
+    * Removed mingw specific hack which made benefit from
+      the fact that mingw-made .dlls export all public symbols,
+      when built for shared.
+
 2009-06-09 10:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     * Minor simplification.
@@ -32,7 +50,7 @@
              GNU Make system.
              Current HB_DYNLIB usage:
                 GNU Make system: ( win or wce ) and non-gcc
-                hbmk2: ( win or wce )
+                hbmk2: ( win or wce ) [DONE]
 
   * contrib/Makefile
   - contrib/hbmsql
@@ -7402,7 +7420,7 @@
 
   * utils/hbmk2/hbmk2.prg
     ! Fixed shared libnames for MinGW family.
-    ; TOFIX: Still doesn't build shared-mode executables.
+    ; TOFIX: Still doesn't build shared-mode executables. [DONE]
 
 2009-04-02 13:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * bin/hb-mkdyn.bat
@@ -8015,7 +8033,7 @@
              Or, if this is no good solution for owatcom users, or not
              an option and performace is more important, we must rename
              owatcom Harbour .dlls to a distinct name: harbour[mt]-11-ow.dll.
-             We should try to avoid that.
+             We should try to avoid that. [SOLVED]
 
   * config/win/bcc.cf
     % -4 -> -6 for Pentium Pro instructions. Looking at the generated
diff --git a/harbour/contrib/rddsql/sddodbc/tests/sddodbc.hbc b/harbour/contrib/rddsql/sddodbc/tests/sddodbc.hbc
index 2b49459186..5bb28427c7 100644
--- a/harbour/contrib/rddsql/sddodbc/tests/sddodbc.hbc
+++ b/harbour/contrib/rddsql/sddodbc/tests/sddodbc.hbc
@@ -3,3 +3,4 @@
 #
 
 libs=rddsql sddodbc
+{win}libs=odbc32
diff --git a/harbour/utils/hbmk2/hbmk2.hbp b/harbour/utils/hbmk2/hbmk2.hbp
index 149e90ac5b..cccf31fdbc 100644
--- a/harbour/utils/hbmk2/hbmk2.hbp
+++ b/harbour/utils/hbmk2/hbmk2.hbp
@@ -6,9 +6,9 @@
 -mt
 hbmk2.prg
 
--l{shared&!allmingw}hbcplr
--l{shared&!allmingw}hbpp
--l{shared&!allmingw}hbcommon
+-lhbcplr
+-lhbpp
+-lhbcommon
 
 hbmk2.${lng}.po
 -hbl=hbmk2.${lng}.hbl
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 85b26eab79..dc8b46f925 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1816,7 +1816,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          /* NOTE: We store -hbdyn objects in different dirs by default as - for Windows
                   platforms - they're always built using different compilation options
                   than normal targets. [vszakats] */
-         IF lCreateDyn .AND. hbmk[ _HBMK_cARCH ] $ "win|wce"
+         /* NOTE: We only use different shared object flags when compiling for
+                  "( win || wce ) & !( allmingw | cygwin )". This may change in the future.
+                  IMPORTANT: Keep this condition in sync with setting -DHB_DYNLIB C compiler flag */
+         IF lCreateDyn .AND. hbmk[ _HBMK_cARCH ] $ "win|wce" .AND. !( hbmk[ _HBMK_cCOMP ] $ "mingw|mingw64|mingwarm|cygwin" )
             DEFAULT cWorkDir TO FN_DirGet( s_cPROGNAME ) + _WORKDIR_DEF_ + hb_osPathSeparator() + "hbdyn"
          ELSE
             DEFAULT cWorkDir TO FN_DirGet( s_cPROGNAME ) + _WORKDIR_DEF_
@@ -2810,7 +2813,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       CASE hbmk[ _HBMK_cARCH ] == "linux" .AND. hbmk[ _HBMK_cCOMP ] == "icc"
       ENDCASE
 
-      IF lCreateDyn .AND. hbmk[ _HBMK_cARCH ] $ "win|wce"
+      /* NOTE: We only use different shared object flags when compiling for
+               "( win || wce ) & !( allmingw | cygwin )". This may change in the future.
+               IMPORTANT: Keep this condition in sync with workdir default settings */
+      IF lCreateDyn .AND. hbmk[ _HBMK_cARCH ] $ "win|wce" .AND. !( hbmk[ _HBMK_cCOMP ] $ "mingw|mingw64|mingwarm|cygwin" )
          IF hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB .OR. ;
             hbmk[ _HBMK_nHBMODE ] == _HBMODE_HB10
             AAdd( hbmk[ _HBMK_aOPTC ], "-D__EXPORT__" )
diff --git a/harbour/utils/hbrun/hbrun.hbp b/harbour/utils/hbrun/hbrun.hbp
index 6af9569d3d..11a019e5be 100644
--- a/harbour/utils/hbrun/hbrun.hbp
+++ b/harbour/utils/hbrun/hbrun.hbp
@@ -4,6 +4,6 @@
 
 hbrun.prg
 
--l{shared&!allmingw}hbcplr
--l{shared&!allmingw}hbpp
--l{shared&!allmingw}hbcommon
+-lhbcplr
+-lhbpp
+-lhbcommon