diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b06fc34fc8..050c2a48f4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,27 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-17 13:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * bin/hb-func.sh
+  * config/beos/libs.mk
+  * config/global.mk
+  * config/bsd/libs.mk
+  * config/darwin/libs.mk
+  * config/hpux/libs.mk
+  * config/dos/djgpp.mk
+  * config/linux/libs.mk
+  * config/sunos/libs.mk
+    * Renamed two variables to be in sync with latest changes:
+      HB_CRS_LIB -> HB_LIBNAME_CURSES
+      HB_SLN_LIB -> HB_LIBNAME_SLANG
+        (this one is not honored by GNU Make system)
+    ; TOFIX: Honor HB_LIBNAME_SLANG in GNU Make system? Is that
+             needed in some cases?
+
+  * config/dos/djgpp.mk
+    + Synced system lib/libpath logic with libs.mk found on
+      other platforms.
+
 2009-09-17 12:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   - bin/pack_src.sh
   + mpkg_src.sh
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index bea68fe182..477347a29b 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -199,8 +199,8 @@ mk_hbtools()
     else
         HB_SYS_LIBS="-lm"
     fi
-    HB_CRS_LIB=""
-    HB_SLN_LIB=""
+    HB_LIBNAME_CURSES=""
+    HB_LIBNAME_SLANG=""
     if [ "${HB_USER_CFLAGS//-DHB_PCRE_REGEX/}" != "${HB_USER_CFLAGS}" ]; then
         HB_SYS_LIBS="-lpcre ${HB_SYS_LIBS}"
         hb_libs="${hb_libs//hbpcre/}"
@@ -222,24 +222,24 @@ mk_hbtools()
         HB_SYS_LIBS="${HB_SYS_LIBS}"
         HB_INC_X11="no"
     else
-        HB_CRS_LIB=""
+        HB_LIBNAME_CURSES=""
         if [ "${HB_PLATFORM}" = "linux" ]; then
             HB_SYS_LIBS="${HB_SYS_LIBS} -ldl -lrt"
         elif [ "${HB_PLATFORM}" = "sunos" ]; then
             HB_SYS_LIBS="${HB_SYS_LIBS} -lrt"
             HB_SYS_LIBS="${HB_SYS_LIBS} -lsocket -lnsl -lresolv"
-            HB_CRS_LIB="curses"
+            HB_LIBNAME_CURSES="curses"
         elif [ "${HB_PLATFORM}" = "hpux" ]; then
             HB_SYS_LIBS="${HB_SYS_LIBS} -lrt"
         fi
         if [ -n "${HB_CURSES_VER}" ]; then
-            HB_CRS_LIB="${HB_CURSES_VER}"
+            HB_LIBNAME_CURSES="${HB_CURSES_VER}"
         elif [ "${HB_NCURSES_194}" = "yes" ]; then
-            HB_CRS_LIB="ncur194"
-        elif [ -z "${HB_CRS_LIB}" ]; then
-            HB_CRS_LIB="ncurses"
+            HB_LIBNAME_CURSES="ncur194"
+        elif [ -z "${HB_LIBNAME_CURSES}" ]; then
+            HB_LIBNAME_CURSES="ncurses"
         fi
-        HB_SLN_LIB="slang"
+        HB_LIBNAME_SLANG="slang"
     fi
     if [ "${HB_USER_CFLAGS//-mlp64/}" != "${HB_USER_CFLAGS}" ]; then
         CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -mlp64"
@@ -526,11 +526,11 @@ if [ -f "\${HB_LIB_INSTALL}/libgtsln.a" ]; then
     elif [ "\${HB_PLATFORM}" = "bsd" ]; then
         SYSTEM_LIBS="\${SYSTEM_LIBS} -L/usr/local/lib"
     fi
-    SYSTEM_LIBS="-l${HB_SLN_LIB:-slang} \${SYSTEM_LIBS}"
+    SYSTEM_LIBS="-l${HB_LIBNAME_SLANG:-slang} \${SYSTEM_LIBS}"
     [ "\${HB_INC_GPM}" != "no" ] && HB_GPM_LIB="gpm"
 fi
 if [ -f "\${HB_LIB_INSTALL}/libgtcrs.a" ]; then
-    SYSTEM_LIBS="-l${HB_CRS_LIB:-ncurses} \${SYSTEM_LIBS}"
+    SYSTEM_LIBS="-l${HB_LIBNAME_CURSES:-ncurses} \${SYSTEM_LIBS}"
     [ "\${HB_INC_GPM}" != "no" ] && HB_GPM_LIB="gpm"
 fi
 if [ "\${HB_INC_X11}" != "no" ]; then
diff --git a/harbour/config/beos/libs.mk b/harbour/config/beos/libs.mk
index c46316bbb6..3ab28697f0 100644
--- a/harbour/config/beos/libs.mk
+++ b/harbour/config/beos/libs.mk
@@ -6,11 +6,11 @@ SYSLIBS :=
 SYSLIBPATHS := /system/lib
 
 ifneq ($(HB_LINKING_RTL),)
-   ifeq ($(HB_CRS_LIB),)
-      HB_CRS_LIB := ncurses
+   ifeq ($(HB_LIBNAME_CURSES),)
+      HB_LIBNAME_CURSES := ncurses
    endif
    ifneq ($(HB_HAS_CURSES),)
-      SYSLIBS += $(HB_CRS_LIB)
+      SYSLIBS += $(HB_LIBNAME_CURSES)
    endif
    ifneq ($(HB_HAS_SLANG),)
       SYSLIBS += slang
diff --git a/harbour/config/bsd/libs.mk b/harbour/config/bsd/libs.mk
index 9c614003db..f3f4ac6379 100644
--- a/harbour/config/bsd/libs.mk
+++ b/harbour/config/bsd/libs.mk
@@ -6,17 +6,17 @@ SYSLIBS :=
 SYSLIBPATHS :=
 
 ifneq ($(HB_LINKING_RTL),)
-   ifeq ($(HB_CRS_LIB),)
-      HB_CRS_LIB := ncurses
+   ifeq ($(HB_LIBNAME_CURSES),)
+      HB_LIBNAME_CURSES := ncurses
    endif
    ifneq ($(HB_HAS_CURSES),)
-      SYSLIBS += $(HB_CRS_LIB)
+      SYSLIBS += $(HB_LIBNAME_CURSES)
    endif
    ifneq ($(HB_HAS_SLANG),)
       SYSLIBS += slang
       # In BSD, slang still needs curses :(
       ifneq ($(HB_HAS_CURSES),)
-         SYSLIBS += $(HB_CRS_LIB)
+         SYSLIBS += $(HB_LIBNAME_CURSES)
       endif
    endif
    ifneq ($(HB_HAS_X11),)
diff --git a/harbour/config/darwin/libs.mk b/harbour/config/darwin/libs.mk
index fc67ff002c..3211c3e848 100644
--- a/harbour/config/darwin/libs.mk
+++ b/harbour/config/darwin/libs.mk
@@ -6,17 +6,17 @@ SYSLIBS :=
 SYSLIBPATHS :=
 
 ifneq ($(HB_LINKING_RTL),)
-   ifeq ($(HB_CRS_LIB),)
-      HB_CRS_LIB := ncurses
+   ifeq ($(HB_LIBNAME_CURSES),)
+      HB_LIBNAME_CURSES := ncurses
    endif
    ifneq ($(HB_HAS_CURSES),)
-      SYSLIBS += $(HB_CRS_LIB)
+      SYSLIBS += $(HB_LIBNAME_CURSES)
    endif
    ifneq ($(HB_HAS_SLANG),)
       SYSLIBS += slang
       # In BSD, slang still needs curses :(
       ifneq ($(HB_HAS_CURSES),)
-         SYSLIBS += $(HB_CRS_LIB)
+         SYSLIBS += $(HB_LIBNAME_CURSES)
       endif
       SYSLIBPATHS += /sw/lib /opt/local/lib
    endif
diff --git a/harbour/config/dos/djgpp.mk b/harbour/config/dos/djgpp.mk
index 6c55fc3619..7484b8c532 100644
--- a/harbour/config/dos/djgpp.mk
+++ b/harbour/config/dos/djgpp.mk
@@ -32,27 +32,29 @@ ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -g
 endif
 
-LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
-LD_OUT := -o
-
-LIBPATHS := -L$(LIB_DIR)
-
-LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
+SYSLIBS :=
+SYSLIBPATHS :=
 
 ifneq ($(HB_LINKING_RTL),)
-   ifeq ($(HB_CRS_LIB),)
-      HB_CRS_LIB := pdcurses
+   ifeq ($(HB_LIBNAME_CURSES),)
+      HB_LIBNAME_CURSES := pdcurses
    endif
    ifneq ($(filter gtcrs, $(LIBS)),)
-      LDLIBS += -l$(HB_CRS_LIB)
+      SYSLIBS += $(HB_LIBNAME_CURSES)
    endif
    ifneq ($(HB_HAS_WATT),)
-      LIBPATHS += -L$(HB_LIB_WATT)
-      LDLIBS += -lwatt
+      SYSLIBPATHS += $(HB_LIB_WATT)
+      SYSLIBS += watt
    endif
 endif
 
-LDLIBS += -lm
+SYSLIBS += m
+
+LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
+LD_OUT := -o
+
+LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
+LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 #       It causes that every command will be separated by LF
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 2b96800215..8ad7daf9da 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -248,7 +248,6 @@ ifeq ($(HB_INIT_DONE),)
       #   HB_BIN_COMPILE              -> HB_BUILD_BIN_DIR
       #   HB_INC_COMPILE              -> - (HB_BUILD_INC_DIR)
       #
-      #   HB_CRS_LIB                  -> HB_LIBNAME_CURSES
       #   HB_DIR_*                    -> HB_LIBDIR_* ? (only used for implib and a few .hbm files)
       #
       #   HB_DLLIBS                   -> (only used in one location, so it's a local matter)
diff --git a/harbour/config/hpux/libs.mk b/harbour/config/hpux/libs.mk
index 264f58f422..762ba4a27e 100644
--- a/harbour/config/hpux/libs.mk
+++ b/harbour/config/hpux/libs.mk
@@ -6,11 +6,11 @@ SYSLIBS :=
 SYSLIBPATHS :=
 
 ifneq ($(HB_LINKING_RTL),)
-   ifeq ($(HB_CRS_LIB),)
-      HB_CRS_LIB := ncurses
+   ifeq ($(HB_LIBNAME_CURSES),)
+      HB_LIBNAME_CURSES := ncurses
    endif
    ifneq ($(HB_HAS_CURSES),)
-      SYSLIBS += $(HB_CRS_LIB)
+      SYSLIBS += $(HB_LIBNAME_CURSES)
    endif
    ifneq ($(HB_HAS_SLANG),)
       SYSLIBS += slang
diff --git a/harbour/config/linux/libs.mk b/harbour/config/linux/libs.mk
index 6e86682413..1198970a41 100644
--- a/harbour/config/linux/libs.mk
+++ b/harbour/config/linux/libs.mk
@@ -6,11 +6,11 @@ SYSLIBS :=
 SYSLIBPATHS :=
 
 ifneq ($(HB_LINKING_RTL),)
-   ifeq ($(HB_CRS_LIB),)
-      HB_CRS_LIB := ncurses
+   ifeq ($(HB_LIBNAME_CURSES),)
+      HB_LIBNAME_CURSES := ncurses
    endif
    ifneq ($(HB_HAS_CURSES),)
-      SYSLIBS += $(HB_CRS_LIB)
+      SYSLIBS += $(HB_LIBNAME_CURSES)
    endif
    ifneq ($(HB_HAS_SLANG),)
       SYSLIBS += slang
diff --git a/harbour/config/sunos/libs.mk b/harbour/config/sunos/libs.mk
index cb61786fa0..f6ac59838f 100644
--- a/harbour/config/sunos/libs.mk
+++ b/harbour/config/sunos/libs.mk
@@ -6,11 +6,11 @@ SYSLIBS :=
 SYSLIBPATHS :=
 
 ifneq ($(HB_LINKING_RTL),)
-   ifeq ($(HB_CRS_LIB),)
-      HB_CRS_LIB := curses
+   ifeq ($(HB_LIBNAME_CURSES),)
+      HB_LIBNAME_CURSES := curses
    endif
    ifneq ($(HB_HAS_CURSES),)
-      SYSLIBS += $(HB_CRS_LIB)
+      SYSLIBS += $(HB_LIBNAME_CURSES)
    endif
    ifneq ($(HB_HAS_SLANG),)
       SYSLIBS += slang