diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c5b2dbad78..3a1e1d561e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,37 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-01 17:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + Adding clib3s lib to system lib list for win/watcom when
+      in -hbdyn mode. This is to fix link errors of 3rd (non-Harbour)
+      dynamic libs in HB_BUILD_CONTRIB_DYN=yes mode.
+      I have no idea why it's needed, so please extended or tweak
+      this fix if you have a better understanding of it.
+      (maybe the lib should be add for all platforms, or for
+      all link modes, etc)
+
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
+    + Enabled for win/watcom. I don't know since when it builds and
+      what fixed it, so it's possible it's still broken with older
+      watcom verions. Now it builds fine with 1.9.
+
+  ; TOFIX: watcom still has problems with missing externals when
+           building hbwin dll:
+              Error! E2028: IID_IDispatch is an undefined reference
+              Error! E2028: IID_IOleObject is an undefined reference
+              Error! E2028: IID_IUnknown is an undefined reference
+              Error! E2028: GUID_NULL is an undefined reference
+              Error! E2028: IID_IProvideClassInfo2 is an undefined reference
+              Error! E2028: IID_IProvideClassInfo is an undefined reference
+              Error! E2028: IID_IConnectionPointContainer is an undefined reference
+              Error! E2028: IID_IEnumVARIANT is an undefined reference
+           gtwvg dll:
+              Error! E2028: IID_IPicture is an undefined reference
+           and hbodbc dll:
+              Error! E2028: _SQLSetStmtAttrW@16 is an undefined reference
+           Any idea?
+
 2011-02-01 16:59 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/3rd/zlib/Makefile
     ! Deleted ugly pocc64 workaround for zlib dynamic build.
diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
index f178eed129..7ccece7786 100644
--- a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
+++ b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
@@ -2,7 +2,8 @@
 # $Id$
 #
 
--stop{(win&watcom)|pocc64|(wce&!mingwarm)}
+# pocc64 version 6.0 is OK, version 5.0 is not (->internal error).
+-stop{pocc64|(wce&!mingwarm)}
 
 -hblib
 -inc
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 48dfd3c17f..b0dd08944c 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3903,6 +3903,12 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
          ENDIF
          DO CASE
          CASE hbmk[ _HBMK_cPLAT ] == "win"
+            IF hbmk[ _HBMK_lCreateDyn ]
+               /* NOTE: Hack to avoid link errors when creating dynamic libs for non-Harbour
+                        components, typically in '3rd' dirs inside Harbour repository.
+                        Please tweak this fix if you know the exact reason. */
+               AAdd( l_aLIBSYS, "clib3s" )
+            ENDIF
             l_aLIBSYS := ArrayAJoin( { l_aLIBSYS, l_aLIBSYSCORE, l_aLIBSYSMISC } )
             l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + cLibExt,;
                                                       "harbour" + cDL_Version_Alter + cLibExt ) }