diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d9a2a0b1f1..1140bbfdb5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,24 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-19 14:43 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/mpkg_deb.sh
+  * harbour/mpkg_rpm.sh
+  * harbour/mpkg_rpm_win.sh
+  * harbour/bin/hb-mkdyn.sh
+  * harbour/bin/postinst.sh
+  * harbour/mpkg_src.sh
+  * harbour/mpkg_rpm_wce.sh
+  * harbour/mpkg_tgz.sh
+    * replaced command used to force script execution by bash,
+      instead of:
+         [ "$BASH" ] || exec bash `which $0` ${1+"$@"}
+      use:
+         [ "$BASH" ] || exec bash $0 "$@"
+
+  * harbour/bin/hb-func.sh
+    ! use HB_HAS_* variables instead of HB_INC_*
+
 2009-09-19 14:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * external/zlib/zlib.dif
   * external/sqlite3/sqlite3.dif
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index d01f8f0eba..6ca389fc20 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-[ "$BASH" ] || exec bash `which $0` ${1+"$@"}
+[ "$BASH" ] || exec bash $0 "$@"
 #
 # $Id$
 #
@@ -214,13 +214,10 @@ mk_hbtools()
     if [ "${HB_COMPILER}" = "mingw" ] || \
        [ "${HB_COMPILER}" = "mingw64" ]; then
         HB_SYS_LIBS="${HB_SYS_LIBS} -luser32 -lwinspool -lgdi32 -lcomctl32 -ladvapi32 -lcomdlg32 -lole32 -loleaut32 -luuid -lws2_32"
-        HB_INC_X11="no"
     elif [ "${HB_COMPILER}" = "mingwarm" ]; then
         HB_SYS_LIBS="${HB_SYS_LIBS} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32 -loleaut32"
-        HB_INC_X11="no"
     elif [ "${HB_COMPILER}" = "djgpp" ]; then
         HB_SYS_LIBS="${HB_SYS_LIBS}"
-        HB_INC_X11="no"
         HB_LIBNAME_CURSES="pdcurses"
     else
         if [ "${HB_PLATFORM}" = "linux" ]; then
@@ -476,13 +473,13 @@ GCC_PATHS="\${HB_PATHS} -L\${HB_LIB_INSTALL}"
 HB_GPM_LIB=""
 if [ -f "\${HB_LIB_INSTALL}/libgtsln.a" ]; then
     SYSTEM_LIBS="-l${HB_LIBNAME_SLANG:-slang} \${SYSTEM_LIBS}"
-    [ "${HB_INC_GPM}" != "no" ] && HB_GPM_LIB="gpm"
+    [ "${HB_HAS_GPM}" != "" ] && HB_GPM_LIB="gpm"
 fi
 if [ -f "\${HB_LIB_INSTALL}/libgtcrs.a" ]; then
     SYSTEM_LIBS="-l${HB_LIBNAME_CURSES:-ncurses} \${SYSTEM_LIBS}"
-    [ "${HB_INC_GPM}" != "no" ] && HB_GPM_LIB="gpm"
+    [ "${HB_HAS_GPM}" != "" ] && HB_GPM_LIB="gpm"
 fi
-if [ "${HB_INC_X11}" != "no" ]; then
+if [ -n "${HB_HAS_X11}" ]; then
     if [ -f "\${HB_LIB_INSTALL}/libgtxvt.a" ] || [ -f "\${HB_LIB_INSTALL}/libgtxwc.a" ]; then
         [ -d "/usr/X11R6/lib64" ] && SYSTEM_LPATHS="\${SYSTEM_LPATHS} -L/usr/X11R6/lib64"
         [ -d "/usr/X11R6/lib" ]   && SYSTEM_LPATHS="\${SYSTEM_LPATHS} -L/usr/X11R6/lib"
diff --git a/harbour/bin/hb-mkdyn.sh b/harbour/bin/hb-mkdyn.sh
index 7089c8eb25..0c69cc24b7 100755
--- a/harbour/bin/hb-mkdyn.sh
+++ b/harbour/bin/hb-mkdyn.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-[ "$BASH" ] || exec bash `which $0` ${1+"$@"}
+[ "$BASH" ] || exec bash $0 "$@"
 #
 # $Id$
 #
diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh
index 9108eaf534..d8f51e9580 100755
--- a/harbour/bin/postinst.sh
+++ b/harbour/bin/postinst.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-[ "$BASH" ] || exec bash `which $0` ${1+"$@"}
+[ "$BASH" ] || exec bash $0 "$@"
 #
 # $Id$
 #
diff --git a/harbour/mpkg_deb.sh b/harbour/mpkg_deb.sh
index 0590c03980..8a8a5d63a8 100755
--- a/harbour/mpkg_deb.sh
+++ b/harbour/mpkg_deb.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-[ "$BASH" ] || exec bash `which $0` ${1+"$@"}
+[ "$BASH" ] || exec bash $0 "$@"
 #
 # $Id$
 #
diff --git a/harbour/mpkg_rpm.sh b/harbour/mpkg_rpm.sh
index 09b2dc9315..e12d397a66 100755
--- a/harbour/mpkg_rpm.sh
+++ b/harbour/mpkg_rpm.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-[ "$BASH" ] || exec bash `which $0` ${1+"$@"}
+[ "$BASH" ] || exec bash $0 "$@"
 #
 # $Id$
 #
diff --git a/harbour/mpkg_rpm_wce.sh b/harbour/mpkg_rpm_wce.sh
index ad447dae8d..5abb1b2797 100755
--- a/harbour/mpkg_rpm_wce.sh
+++ b/harbour/mpkg_rpm_wce.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-[ "$BASH" ] || exec bash `which $0` ${1+"$@"}
+[ "$BASH" ] || exec bash $0 "$@"
 #
 # $Id$
 #
diff --git a/harbour/mpkg_rpm_win.sh b/harbour/mpkg_rpm_win.sh
index 2c13978458..00e0fcdefd 100755
--- a/harbour/mpkg_rpm_win.sh
+++ b/harbour/mpkg_rpm_win.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-[ "$BASH" ] || exec bash `which $0` ${1+"$@"}
+[ "$BASH" ] || exec bash $0 "$@"
 #
 # $Id$
 #
diff --git a/harbour/mpkg_src.sh b/harbour/mpkg_src.sh
index 2b635b9937..7a0f03af25 100755
--- a/harbour/mpkg_src.sh
+++ b/harbour/mpkg_src.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-[ "$BASH" ] || exec bash `which $0` ${1+"$@"}
+[ "$BASH" ] || exec bash $0 "$@"
 #
 # $Id$
 #
diff --git a/harbour/mpkg_tgz.sh b/harbour/mpkg_tgz.sh
index ae9fc1937d..763e3a435d 100755
--- a/harbour/mpkg_tgz.sh
+++ b/harbour/mpkg_tgz.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-[ "$BASH" ] || exec bash `which $0` ${1+"$@"}
+[ "$BASH" ] || exec bash $0 "$@"
 #
 # $Id$
 #