diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f93e264245..b4c774a97d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,26 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-21 15:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/sunos/global.mk
+    ! Fixed to not use -s option for stripping. This doesn't seem to
+      be supported on sunos platform, at least according to code found
+      in hbmk2.
+
+  * utils/hbmk2/hbmk2.prg
+    + Added support for -strip in -hbdyn mode.
+    + Added -strip support for sunos/gcc targets.
+    ! Fixed to use strip command instead of -s option with sunos/sunpro
+      targets.
+
+  * utils/hbmk2/hbmk2.prg
+  * config/bin.mk
+    + Added hbmainstd lib for os/2 targets in shared mode.
+      Maurilio, please restest after this change.
+
+  ; Needless to say I couldn't test these, so I'd appreciate if sunos
+    users could verify it (except -strip in -hbdyn mode).
+
 2009-09-21 14:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * harbour-win-spec
   * harbour-wce-spec
diff --git a/harbour/config/bin.mk b/harbour/config/bin.mk
index 34e39a44ee..d1027fa631 100644
--- a/harbour/config/bin.mk
+++ b/harbour/config/bin.mk
@@ -29,8 +29,12 @@ ifeq ($(BUILD_SHARED),yes)
       else
          HB_LIBS_TPL += hbmainstd hbmainwin
       endif
-   else ifeq ($(HB_PLATFORM)-$(HB_COMPILER),os2-watcom)
-      HB_LDFLAGS += FILE $(LIB_DIR)/hbmainstd.lib
+   else ifeq ($(HB_PLATFORM),os2)
+      ifeq ($(HB_COMPILER),watcom)
+         HB_LDFLAGS += FILE $(LIB_DIR)/hbmainstd.lib
+      else
+         HB_LIBS_TPL += hbmainstd
+      endif
    endif
 
    HB_LIBS_ST_RDD := $(HB_LIBS_TPL) $(HB_DYNLIB_ST)
diff --git a/harbour/config/sunos/global.mk b/harbour/config/sunos/global.mk
index 87c4385d34..0d5a67c857 100644
--- a/harbour/config/sunos/global.mk
+++ b/harbour/config/sunos/global.mk
@@ -14,6 +14,6 @@ ifneq ($(filter $(HB_BUILD_STRIP),all lib),)
    ARSTRIP = && strip -S $(LIB_DIR)/$@
 endif
 ifneq ($(filter $(HB_BUILD_STRIP),all bin),)
-   LDSTRIP := -s
-   DYSTRIP := -s
+   LDSTRIP = && strip $(BIN_DIR)/$@
+   DYSTRIP = && strip -S $(DYN_DIR)/$@
 endif
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 058df40fb6..c18fd93643 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2181,11 +2181,12 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             ENDIF
          ENDIF
          IF hbmk[ _HBMK_lSTRIP ]
-            IF hbmk[ _HBMK_cPLAT ] == "darwin"
+            IF hbmk[ _HBMK_cPLAT ] $ "darwin|sunos"
                cBin_Post := "strip"
                cOpt_Post := "{OB}"
-            ELSEIF !( hbmk[ _HBMK_cPLAT ] == "sunos" )
+            ELSE
                AAdd( hbmk[ _HBMK_aOPTL ], "-s" )
+               AAdd( hbmk[ _HBMK_aOPTD ], "-s" )
             ENDIF
          ENDIF
          IF lStopAfterCComp
@@ -2357,6 +2358,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ENDIF
          IF hbmk[ _HBMK_lSTRIP ]
             AAdd( hbmk[ _HBMK_aOPTL ], "-s" )
+            AAdd( hbmk[ _HBMK_aOPTD ], "-s" )
          ENDIF
          IF lStopAfterCComp
             IF ! lCreateLib .AND. ! lCreateDyn .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1
@@ -2436,6 +2438,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ENDIF
          IF hbmk[ _HBMK_lSTRIP ]
             AAdd( hbmk[ _HBMK_aOPTL ], "-s" )
+            AAdd( hbmk[ _HBMK_aOPTD ], "-s" )
          ENDIF
          /* OS/2 needs a space between -o and file name following it */
          IF lStopAfterCComp
@@ -2446,6 +2449,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             AAdd( hbmk[ _HBMK_aOPTL ], "-o {OE}" )
          ENDIF
 
+         l_aLIBSHAREDPOST := { "hbmainstd" }
          l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-os2",;
                                                    "harbour" + cDL_Version_Alter + "-os2" ) }
 
@@ -2501,6 +2505,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ENDIF
          IF hbmk[ _HBMK_lSTRIP ]
             AAdd( hbmk[ _HBMK_aOPTL ], "-s" )
+            AAdd( hbmk[ _HBMK_aOPTD ], "-s" )
          ENDIF
          IF lStopAfterCComp
             IF ! lCreateLib .AND. ! lCreateDyn .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1
@@ -3021,7 +3026,13 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             AAdd( hbmk[ _HBMK_aOPTL ], "-B -static" )
          ENDIF
          IF hbmk[ _HBMK_lSTRIP ]
-            AAdd( hbmk[ _HBMK_aOPTL ], "-s" )
+            IF hbmk[ _HBMK_cPLAT ] == "sunos"
+               cBin_Post := "strip"
+               cOpt_Post := "{OB}"
+            ELSE
+               AAdd( hbmk[ _HBMK_aOPTL ], "-s" )
+               AAdd( hbmk[ _HBMK_aOPTD ], "-s" )
+            ENDIF
          ENDIF
          IF lStopAfterCComp
             IF ! lCreateLib .AND. ! lCreateDyn .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1