diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2bc7887c65..531dd39ee4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-19 11:34 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/global.mk
+    ! extended shell detection - now when we do not use make_gnu.sh
+      we have to accept also shells like ksh which do not set SHLVL
+      envvar.
+      Probably the safest method is using HB_SHELL=sh for all host
+      platforms except DOS, WIN & OS2.
+
 2009-08-19 11:05 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/Makefile
   * harbour/config/dir.mk
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 0cddf4dd05..9449f8c23e 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -306,7 +306,7 @@ endif
 ifneq ($(SHLVL),)
    HB_SHELL := sh
 else
-   ifeq ($(SHELL),/bin/sh)
+   ifeq ($(patsubst /bin/%sh,sh,$(SHELL)),sh)
       HB_SHELL := sh
    else
       ifneq ($(OS2_SHELL),)