diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index abdb082904..dbf85b2b45 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+
+2009-09-23 14:15 UTC+0200 Maurilio Longo (maurilio.longo@libero.it)
+   * config/os2/gcc.mk
+   * source/vm/Makefile
+     * finalized OS/2 GCC .DLLs creation at build time.
+
 2009-09-23 14:30 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * contrib/hbmemio/memio.c
     ! fixed cleanup code
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index e7bdf27702..959557fd83 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -92,13 +92,14 @@ endef
 define create_dynlib
    $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
    $(if $(wildcard __dyn__.def),@$(RM) __dyn__.def,)
-   @$(ECHO) LIBRARY $@ INITINSTANCE TERMINSTANCE >> __dyn__.def
+   @$(ECHO) LIBRARY $(DYNNAME) INITINSTANCE TERMINSTANCE >> __dyn__.def
    @$(ECHO) PROTMODE >> __dyn__.def
    @$(ECHO) CODE PRELOAD MOVEABLE DISCARDABLE >> __dyn__.def
    @$(ECHO) DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> __dyn__.def
    @$(ECHO) EXPORTS >> __dyn__.def
    $(foreach file,$^,$(dyn_object))
    $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ @__dyn__.tmp __dyn__.def $(DLIBS) $(DYSTRIP)
+   emximp -o $(IMP_FILE) $(DYN_DIR)/$@
 endef
 
 DY_RULE = $(create_dynlib)
diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile
index 0f86815f10..267062e28a 100644
--- a/harbour/source/vm/Makefile
+++ b/harbour/source/vm/Makefile
@@ -49,7 +49,7 @@ else
    else
       ifeq ($(HB_PLATFORM),os2)
          C_MAIN := mainstd.c
-         DIRS := maindllh
+         DIRS := mainstd maindllh
       else
          C_MAIN := main.c
       endif