diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6d57464f4c..e97b43bfe0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,27 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-18 22:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + Added extension to license. Pls read it, especially projects
+      including hbmk2 or modified version of hbmk2 (f.e. MiniGUI).
+      Help text and documentation is now covered by Creative Commons
+      Attribution-ShareAlike 3.0.
+      Plus some restriction to not tear hbmk2 off of Harbour Project,
+      to clearly show modified nature and always distribute modified
+      source.
+      My intent is to leave hbmk2 as coherent part of Harbour,
+      possibly unmodified and my name not stripped.
+
+  * config/global.mk
+    % Minor opt.
+
+  * package/mpkg_nightly.sh
+    ! Harmless typo.
+
+  * package/winuni/RELNOTES
+    * Updated.
+
 2010-08-18 22:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     + Some binary link.
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 7160ea4ab1..aab4b86d49 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1422,15 +1422,16 @@ ifneq ($(HB_HAS_X11),)
 endif
 
 ifneq ($(HB_PLATFORM),dos)
+   HB_PKGNAME := harbour
    ifneq ($(HB_PLATFORM_UNIX),)
       HB_VERSION := $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)
       ifneq ($(HB_VER_STATUS),)
          HB_VERSION := $(HB_VERSION)-$(HB_VER_STATUS)
       endif
-      HB_PKGNAME := harbour-$(HB_VERSION)
+      HB_PKGNAME := $(HB_PKGNAME)-$(HB_VERSION)
    else
       HB_VERSION := $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(HB_VER_STATUS)
-      HB_PKGNAME := harbour-$(HB_VERSION)-$(HB_PLATFORM)-$(HB_COMPILER)
+      HB_PKGNAME := $(HB_PKGNAME)-$(HB_VERSION)-$(HB_PLATFORM)-$(HB_COMPILER)
    endif
    HB_PKGNAMI := $(HB_PKGNAME)
 else
diff --git a/harbour/package/mpkg_nightly.sh b/harbour/package/mpkg_nightly.sh
index 8ba75b2faf..dd0c104481 100755
--- a/harbour/package/mpkg_nightly.sh
+++ b/harbour/package/mpkg_nightly.sh
@@ -92,9 +92,9 @@ else
       echo Uploading packages to sf.net file release area...
 
       desthost=",harbour-project@frs.sourceforge.net:"
-      scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly-src.zip $HB_SFNET_USER,$desthost$destdir
-      scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly.tar.bz2 $HB_SFNET_USER,$desthost$destdir
-      scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly.tar.gz  $HB_SFNET_USER,$desthost$destdir
+      scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly-src.zip $HB_SFNET_USER$desthost$destdir
+      scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly.tar.bz2 $HB_SFNET_USER$desthost$destdir
+      scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly.tar.gz  $HB_SFNET_USER$desthost$destdir
    fi
 fi
 
diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES
index e8a1856e3d..a1eeac6d50 100644
--- a/harbour/package/winuni/RELNOTES
+++ b/harbour/package/winuni/RELNOTES
@@ -63,7 +63,7 @@ Tool/lib versions used to create this package:
    FreeImage 3.13.1
    GD 2.0.35
    MySQL 5.1.41
-   OCILIB 3.6.0
+   OCILIB 3.7.0
    OpenSSL 1.0.0a
    PostgreSQL 8.4.2-1
    QT 4.6.3
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 74ba4a00bf..2f25a85913 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -24,6 +24,20 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
  * their web site at http://www.gnu.org/).
  *
+ * License extensions:
+ *   - This source code must be kept and distributed as part
+ *     of the Harbour package and/or the placement of the tool sources
+ *     and files must reflect that it is part of Harbour Project.
+ *   - hbmk2 copyright information must always be presented by
+ *     projects including this tool or help text.
+ *   - Modified versions of the tool must clearly state this
+ *     fact on the copyright screen.
+ *   - Source code modifications shall always be made available
+ *     along with binaries.
+ *   - Help text and documentation is licensed under
+ *     Creative Commons Attribution-ShareAlike 3.0:
+ *     http://creativecommons.org/licenses/by-sa/3.0/
+ *
  */
 
 /*