diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 72d8a56886..88b8a34c31 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-28 10:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.cf
+  * config/globsh.cf
+    + Moved $(DIRSEP) defaulting to global.cf for non-sh shells.
+
+  * config/global.cf
+    ! Reverted prev opt. $(DIRSEP) must be used as the values are
+      exported and used in native script/batch files.
+
 2009-07-28 10:26 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * make_gnu_os2.cmd
   * make_gnu.bat
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index aecec5afb4..cc37e36af1 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -99,20 +99,6 @@ endif
 
 endef
 
-# Directory separator default
-ifeq ($(DIRSEP),)
-   DIRSEP = /
-endif
-ifeq ($(PTHSEP),)
-   # small hack, it's hard to detect what is real path separator because
-   # some shells in DOS/Windows translates DOS style paths to POSIX form
-   ifeq ($(subst ;,:,$(PATH)),$(PATH))
-      PTHSEP = :
-   else
-      PTHSEP = ;
-   endif
-endif
-
 # Shell detection
 ifneq ($(SHLVL),)
    HB_SHELL := sh
@@ -149,6 +135,24 @@ ifneq ($(HB_SHELL),sh)
    endif
 endif
 
+# Directory separator default
+ifeq ($(DIRSEP),)
+   DIRSEP = /
+   ifneq ($(HB_SHELL),sh)
+      DIRSEP = $(subst /,\,\)
+   endif
+endif
+# Path separator default
+ifeq ($(PTHSEP),)
+   # small hack, it's hard to detect what is real path separator because
+   # some shells in DOS/Windows translates DOS style paths to POSIX form
+   ifeq ($(subst ;,:,$(PATH)),$(PATH))
+      PTHSEP = :
+   else
+      PTHSEP = ;
+   endif
+endif
+
 ifeq ($(HB_HOST_ARCH),)
    $(eval $(call check_host,$(OSTYPE),))
    ifeq ($(HB_HOST_ARCH),)
@@ -369,20 +373,20 @@ ifneq ($(HB_DB_DRVEXT),)
 endif
 
 ifeq ($(HB_UNIX_COMPATIBLE),no)
-   LIBPOSTFIX := /$(ARCH_COMP)
+   LIBPOSTFIX := $(DIRSEP)$(HB_ARCHITECTURE)$(DIRSEP)$(HB_COMPILER)
 endif
 
 ifeq ($(HB_BIN_INSTALL),)
-   export HB_BIN_INSTALL := $(HB_INSTALL_PREFIX)/bin
+   export HB_BIN_INSTALL := $(HB_INSTALL_PREFIX)$(DIRSEP)bin
 endif
 ifeq ($(HB_LIB_INSTALL),)
-   export HB_LIB_INSTALL := $(HB_INSTALL_PREFIX)/lib$(LIBPOSTFIX)
+   export HB_LIB_INSTALL := $(HB_INSTALL_PREFIX)$(DIRSEP)lib$(LIBPOSTFIX)
 endif
 ifeq ($(HB_INC_INSTALL),)
-   export HB_INC_INSTALL := $(HB_INSTALL_PREFIX)/include$(INCPOSTFIX)
+   export HB_INC_INSTALL := $(HB_INSTALL_PREFIX)$(DIRSEP)include$(INCPOSTFIX)
 endif
 ifeq ($(HB_DOC_INSTALL),)
-   export HB_DOC_INSTALL := $(HB_INSTALL_PREFIX)/doc
+   export HB_DOC_INSTALL := $(HB_INSTALL_PREFIX)$(DIRSEP)doc
 endif
 
 ifeq ($(HB_BIN_COMPILE),)
diff --git a/harbour/config/globsh.cf b/harbour/config/globsh.cf
index 7db09ef288..05fc966928 100644
--- a/harbour/config/globsh.cf
+++ b/harbour/config/globsh.cf
@@ -10,8 +10,6 @@
 
 ifneq ($(HB_SHELL),sh)
 
-DIRSEP = $(subst /,\,\)
-
 OBJ_DIR_OS = $(subst /,\,$(OBJ_DIR))
 LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
 LIB_FILE_OS = $(subst /,\,$(LIB_FILE))