diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4bb4cf661d..80b12eb53a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,31 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-11-19 09:04 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * bin/hb-func.sh
+  * mpkg_tgz.sh
+    ! Fixed OSX/Darwin builds:
+      - to not require harbour.dylib for binary tools supplied 
+        in .tgz package. This way, hbrun/hbmake/hbdoc/hbtest 
+        will work out of the box without the need for any 
+        special installation or extra manual procedure, or 
+        any change whatsoever in the user/system environment. 
+        The change also doesn't prevent user installing Harbour 
+        to system dirs and/or to utilize harbour.dylib in every way.
+      - so that hbmk script creates '-static' executables by default.
+        This will make all programs created by hbmk to work out of the 
+        box without any special trick described above, or explicit 
+        need to use '-static' switch.
+        You can override this with '-shared' switch.
+      ; [ The price to pay is slightly larger binary package 
+          and executable sizes. ]
+
+  * make_gnu.sh
+    * Minor sync in help text with recent change.
+
+  * common.mak
+    ! Old typo.
+
 2008-11-19 06:27 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/bin/hb-func.sh
     * updated OS release version checking for new OpenSuse distros
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 359a44ab06..cdc21918f1 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -130,6 +130,17 @@ mk_hbtools()
             hb_shared_default=" (default)"
         fi
         hb_exesuf=".exe"
+    elif [ "${HB_ARCHITECTURE}" = "darwin" ]; then
+        hb_tool="$1/${hb_pref}-build"
+        hb_path_separator=":"
+        if [ "${HB_MK_STATIC}" != "no" ]; then
+            hb_static="yes"
+            hb_static_default=" (default)"
+        else
+            hb_static="no"
+            hb_shared_default=" (default)"
+        fi
+        hb_exesuf=""
     else
         hb_tool="$1/${hb_pref}-build"
         hb_path_separator=":"
diff --git a/harbour/common.mak b/harbour/common.mak
index 17fa85d0b9..edda2afd86 100644
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -29,7 +29,7 @@
 #    set DEL=cmd /c del
 #
 # The above might be needed on Windows 2000 and XP.
-# The macros are referenced in makefile.bc
+# The macros are referenced in make_b32.mak
 # ---------------------------------------------------------------
 
 !ifndef ECHO
diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh
index af85dde299..f42e0779be 100755
--- a/harbour/make_gnu.sh
+++ b/harbour/make_gnu.sh
@@ -150,7 +150,7 @@ if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then
    echo "        - bcc16   (Borland C++ 3.x, 4.x, 5.0x, DOS 16-bit)"
    echo "        - djgpp   (Delorie GNU C, DOS 32-bit)"
    echo "        - rsx32   (EMX/RSXNT/DOS GNU C, DOS 32-bit)"
-   echo "        - watcom  (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit)"
+   echo "        - owatcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit)"
    echo "      - When HB_ARCHITECTURE=w32"
    echo "        - bcc32   (Borland C++ 4.x, 5.x, Windows 32-bit)"
    echo "        - gcc     (Cygnus/Cygwin GNU C, Windows 32-bit)"
diff --git a/harbour/mpkg_tgz.sh b/harbour/mpkg_tgz.sh
index c287afe481..f5a66a1185 100755
--- a/harbour/mpkg_tgz.sh
+++ b/harbour/mpkg_tgz.sh
@@ -91,6 +91,7 @@ case "$HB_ARCHITECTURE" in
         [ -z "$HB_INSTALL_PREFIX" ] && HB_INSTALL_PREFIX="/usr/local"
         HB_INSTALL_GROUP=wheel
         ETC="/private/etc"
+        hb_lnkso="no"
         ;;
     linux)
         [ -z "$HB_INSTALL_PREFIX" ] && HB_INSTALL_PREFIX="/usr"