diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ade704baec..e1088b5292 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-21 15:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbextern.ch
+    + Added __CLSMSGTYPE function.
+
+  * config/os2/gcc.mk
+    * Changed to use 'ld' tools directly when creating
+      Harbour dynamic libraries.
+    ; Please test, it's possible that some option have to be
+      deleted, changed, or some system/compiler libs added
+      manually to make it work.
+
 2010-02-21 13:48 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/ChangeLog
     ! fixed typo
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index 028d308412..4ff8b06b3a 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -107,7 +107,11 @@ else
    AR_RULE = $(create_library) $(ARSTRIP) & $(RM) __lib__.tmp
 endif
 
-DY := $(CC)
+ifeq ($(HB_COMPILER),gccomf)
+   DY := $(HB_CCPATH)$(HB_CCPREFIX)emxomfld
+else
+   DY := $(HB_CCPATH)$(HB_CCPREFIX)ld
+endif
 DFLAGS += -shared $(LIBPATHS)
 ifeq ($(HB_COMPILER),gccomf)
    DFLAGS += -Zomf
diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch
index b9046e6668..ea90519f43 100644
--- a/harbour/include/hbextern.ch
+++ b/harbour/include/hbextern.ch
@@ -498,6 +498,7 @@ EXTERNAL __CLSLOCK
 EXTERNAL __CLSMODMSG
 EXTERNAL __CLSNEW
 EXTERNAL __CLSPARENT
+EXTERNAL __CLSMSGTYPE
 
 EXTERNAL __OBJADDDATA
 EXTERNAL __OBJADDINLINE