diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fe4c88cf65..bb80f991e2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,23 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-07 14:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * package/winuni/RELNOTES
+    + Note about upx update. (still no win64 support, but there are 
+      some other goodies for OS X and Linux)
+
+  * utils/hbmk2/hbmk2.prg
+    + Enabled upx support on darwin. (You need to install it via 
+      macports)
+
+  * INSTALL
+    + Added upx to macports install list for darwin.
+    + Added few missing '$' prefixes from commands included in text.
+
+  * config/common/watcom.mk
+    - Deleted OS/2 make bug workaround.
+      Thanks to David Arturo Macias Corona for instructions/tests.
+
 2009-10-07 11:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * tests/transtst.prg
   * doc/pp.txt
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 70a7bf2b30..09020970c4 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -319,7 +319,8 @@ HARBOUR
 
       1.) Install MacPorts, follow their instructions:
           https://www.macports.org/
-      2.) sudo port install pcre slang allegro freeimage gd2 mysql5-devel postgresql84
+      2.) $ sudo port install pcre slang allegro freeimage gd2 mysql5-devel postgresql84 
+          $ sudo port install upx
 
    Linux (generic)
    ---------------
@@ -335,27 +336,27 @@ HARBOUR
    ------------------------------------------
    (tested with Ubuntu 7.04, 8.04, 9.04)
 
-      for zlib support:          sudo apt-get install zlib1g-dev
-      for pcre regex support:    sudo apt-get install libpcre3-dev
-      for gtcrs terminal lib:    sudo apt-get install libncurses-dev
-      for gtsln terminal lib:    sudo apt-get install libslang2-dev OR
-                                 sudo apt-get install libslang1-dev
-      for gtxwc terminal lib:    sudo apt-get install libx11-dev
-      for console mouse support: sudo apt-get install libgpm-dev OR
-                                 sudo apt-get install libgpmg1-dev
-      for contrib/gtalleg lib:   sudo apt-get install liballegro4.2-dev
-      for contrib/hbodbc lib:    sudo apt-get install unixodbc-dev
-      for contrib/hbcurl lib:    sudo apt-get install libcurl4-openssl-dev OR
-                                 sudo apt-get install libcurl4-gnutls-dev
-      for contrib/hbfbird lib:   sudo apt-get install firebird2.1-dev OR
-                                 sudo apt-get install libfirebird2.0-dev
-      for contrib/hbfimage lib:  sudo apt-get install libfreeimage-dev
-      for contrib/hbgd lib:      sudo apt-get install libgd2-xpm-dev OR
-                                 sudo apt-get install libgd-xpm-dev
-      for contrib/hbmysql lib:   sudo apt-get install libmysqlclient15-dev
-      for contrib/hbpgsql lib:   sudo apt-get install libpq-dev
-      for contrib/hbqt lib:      sudo apt-get install libqt4-dev
-      for contrib/hbsqlit3 lib:  sudo apt-get install libsqlite3-dev
+      for zlib support:          $ sudo apt-get install zlib1g-dev
+      for pcre regex support:    $ sudo apt-get install libpcre3-dev
+      for gtcrs terminal lib:    $ sudo apt-get install libncurses-dev
+      for gtsln terminal lib:    $ sudo apt-get install libslang2-dev OR
+                                 $ sudo apt-get install libslang1-dev
+      for gtxwc terminal lib:    $ sudo apt-get install libx11-dev
+      for console mouse support: $ sudo apt-get install libgpm-dev OR
+                                 $ sudo apt-get install libgpmg1-dev
+      for contrib/gtalleg lib:   $ sudo apt-get install liballegro4.2-dev
+      for contrib/hbodbc lib:    $ sudo apt-get install unixodbc-dev
+      for contrib/hbcurl lib:    $ sudo apt-get install libcurl4-openssl-dev OR
+                                 $ sudo apt-get install libcurl4-gnutls-dev
+      for contrib/hbfbird lib:   $ sudo apt-get install firebird2.1-dev OR
+                                 $ sudo apt-get install libfirebird2.0-dev
+      for contrib/hbfimage lib:  $ sudo apt-get install libfreeimage-dev
+      for contrib/hbgd lib:      $ sudo apt-get install libgd2-xpm-dev OR
+                                 $ sudo apt-get install libgd-xpm-dev
+      for contrib/hbmysql lib:   $ sudo apt-get install libmysqlclient15-dev
+      for contrib/hbpgsql lib:   $ sudo apt-get install libpq-dev
+      for contrib/hbqt lib:      $ sudo apt-get install libqt4-dev
+      for contrib/hbsqlit3 lib:  $ sudo apt-get install libsqlite3-dev
 
    Linux (openSUSE, .rpm based distros)
    ------------------------------------
diff --git a/harbour/config/common/watcom.mk b/harbour/config/common/watcom.mk
index e3dfb7a893..768dfe72c0 100644
--- a/harbour/config/common/watcom.mk
+++ b/harbour/config/common/watcom.mk
@@ -29,25 +29,6 @@ LDLIBS_COMMA := $(subst $(subst x,x, ),$(comma) ,$(strip $(LDLIBS)))
 LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@ FILE $(LDFILES_COMMA) $(if $(LDLIBS_COMMA), LIB $(LDLIBS_COMMA),)
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file))
 
-ifeq ($(HB_SHELL),os2)
-   # maximum size of command line in OS2 is limited to 1024 characters
-   # the trick with divided 'wordlist' is workaround for it:
-   #     -$(if $(wordlist   1,100,$(^F)), @$(ECHO) $(ECHOQUOTE)$(wordlist   1,100,$(addprefix -+,$(^F)))$(ECHOQUOTE) >> __lib__.tmp,)
-   #     -$(if $(wordlist 101,200,$(^F)), @$(ECHO) $(ECHOQUOTE)$(wordlist 101,200,$(addprefix -+,$(^F)))$(ECHOQUOTE) >> __lib__.tmp,)
-   #     -$(if $(wordlist 201,300,$(^F)), @$(ECHO) $(ECHOQUOTE)$(wordlist 301,300,$(addprefix -+,$(^F)))$(ECHOQUOTE) >> __lib__.tmp,)
-   # anyhow OS/2 port# of GNU make 3.81 seems to have bug and GPFs when total
-   # commands length is too big so for %i in ( *$(OBJ_EXT) ) do ... below is
-   # ugly workaround for both problems
-
-   define create_library
-      @$(ECHO) $(ECHOQUOTE)$(LIB_DIR)/$@$(ECHOQUOTE) > __lib__.tmp
-      for %f in ( *$(OBJ_EXT) ) do @$(ECHO) $(ECHOQUOTE)-+%f$(ECHOQUOTE) >> __lib__.tmp
-      $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) @__lib__.tmp
-   endef
-
-   AR_RULE = $(create_library)
-endif
-
 ifeq ($(HB_SHELL),dos)
 
    # NOTE: The empty line directly before 'endef' HAVE TO exist!
diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES
index 420c6f63c4..43e79eb056 100644
--- a/harbour/package/winuni/RELNOTES
+++ b/harbour/package/winuni/RELNOTES
@@ -69,6 +69,7 @@ Changes since previous (2.0.0beta3 20090905) release:
 -----------------------------------------------------------------------
 
 - MinGW CEGCC updated to 4.4.0
+- upx updated to 3.04.
 
 Changes since previous (2.0.0beta2 20090624) release:
 -----------------------------------------------------------------------
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 62b558606b..cce96ef914 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -4322,7 +4322,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
 
          /* Setup compressor for host platform */
 
-         #if defined( __PLATFORM__LINUX )
+         #if defined( __PLATFORM__LINUX ) .OR. ;
+             defined( __PLATFORM__DARWIN )
 
             cBin_Cprs := "upx"
             cOpt_Cprs := "{OB}"