diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f70bb8f74d..94fc91d0c5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,19 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-22 18:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+  * config/global.mk
+    ! Changed .dll names for OS/2 to be the same as in MS-DOS:
+      harbour/harbourm. (.dll names in OS/2 are limited to 8.3)
+
+  * config/dos/djgpp.mk
+    ! Attempt to fix empty line problem when stripping isn't requested.
+      Something better would be good here.
+
+  * config/os2/gcc.mk
+    ! Fixed empty line problem when stripping isn't requested.
+
 2009-09-22 17:10 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * contrib/hbmemio/memio.c
     + added cleanup on application exit
diff --git a/harbour/config/dos/djgpp.mk b/harbour/config/dos/djgpp.mk
index 69a980df7c..a393fe4614 100644
--- a/harbour/config/dos/djgpp.mk
+++ b/harbour/config/dos/djgpp.mk
@@ -34,6 +34,8 @@ endif
 
 ifneq ($(filter $(HB_BUILD_STRIP),all lib),)
    ARSTRIP = $(HB_CCPATH)$(HB_CCPREFIX)strip -S $(LIB_DIR)/$@
+else
+   ARSTRIP := @$(ECHO) .
 endif
 ifneq ($(filter $(HB_BUILD_STRIP),all bin),)
    LDSTRIP := -s
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index ec89afe7d1..6e0f101101 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1362,10 +1362,6 @@ ifeq ($(HB_INIT_DONE),)
                   endif
                endif
             endif
-         else
-            ifeq ($(HB_PLATFORM),os2)
-               DYNNAME_POST := $(DYNNAME_POST)-os2
-            endif
          endif
       endif
 
@@ -1374,6 +1370,11 @@ ifeq ($(HB_INIT_DONE),)
          HB_DYNLIB_BASE_MT := harbourm
          HB_DYNLIB_ST := $(HB_DYNLIB_BASE_ST)
          HB_DYNLIB_MT := $(HB_DYNLIB_BASE_MT)
+      ifeq ($(HB_PLATFORM),os2)
+         HB_DYNLIB_BASE_ST := harbour
+         HB_DYNLIB_BASE_MT := harbourm
+         HB_DYNLIB_ST := $(HB_DYNLIB_BASE_ST)
+         HB_DYNLIB_MT := $(HB_DYNLIB_BASE_MT)
       else
          HB_DYNLIB_BASE_ST := harbour
          HB_DYNLIB_BASE_MT := harbourmt
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index b06f00ddf6..e7bdf27702 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -33,7 +33,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 endif
 
 ifneq ($(filter $(HB_BUILD_STRIP),all lib),)
-   ARSTRIP = ${HB_CCPATH}${HB_CCPREFIX}strip -S $(LIB_DIR)/$@
+   ARSTRIP = & ${HB_CCPATH}${HB_CCPREFIX}strip -S $(LIB_DIR)/$@
 endif
 ifneq ($(filter $(HB_BUILD_STRIP),all bin),)
    LDSTRIP := -s
@@ -71,13 +71,12 @@ define create_library
    @$(ECHO) $(ECHOQUOTE)SAVE$(ECHOQUOTE) >> __lib__.tmp
    @$(ECHO) $(ECHOQUOTE)END$(ECHOQUOTE) >> __lib__.tmp
    $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -M < __lib__.tmp
-   $(ARSTRIP)
 endef
 
 # Under OS/2 || isn't a command separator (inside a shell, that is); correct separator is &
 AR := $(HB_CCPATH)$(HB_CCPREFIX)ar
 ARFLAGS :=
-AR_RULE = $(create_library) & $(RM) __lib__.tmp
+AR_RULE = $(create_library) $(ARSTRIP) & $(RM) __lib__.tmp
 
 DY := $(CC)
 DFLAGS := -shared $(LIBPATHS)
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index e91159031a..e5af18f5f9 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2464,8 +2464,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ENDIF
 
          l_aLIBSHAREDPOST := { "hbmainstd" }
-         l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-os2",;
-                                                   "harbour" + cDL_Version_Alter + "-os2" ) }
+         l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourm",;
+                                                   "harbour" ) }
 
          cBin_Res := hbmk[ _HBMK_cCCPREFIX ] + "windres" + cCCEXT
          cResExt := ".reso"
@@ -2680,8 +2680,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             ENDIF
          CASE hbmk[ _HBMK_cPLAT ] == "os2"
             l_aLIBSYS := ArrayAJoin( { l_aLIBSYS, l_aLIBSYSCORE, l_aLIBSYSMISC } )
-            l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-os2" + cLibExt,;
-                                                      "harbour" + cDL_Version_Alter + "-os2" + cLibExt ) }
+            l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourm" + cLibExt,;
+                                                      "harbour" + cLibExt ) }
 
             IF hbmk[ _HBMK_lSHARED ]
                /* TOFIX: This line is plain guessing. */