diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index af3a98cc17..bf7549acc9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-14 18:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * bin/hb-func.sh
+  * make_gnu.sh
+    * Moved lib detection logic to hb-func.sh.
+    ; It'd be better to have a way to gather such information
+      along the make process in some .cfg files.
+
+  * source/rtl/gtcrs/Makefile
+    - Deleted some header locations which weren't checked anyway
+      before these changes. Please review.
+
+  * config/djg-make.exe
+    + Updated to 3.81 (from 3.79.1) found in djgpp 2.04 (beta)
+      (doesn't resolve the dos/watcom problem with hbpp)
+
 2009-07-14 16:48 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/pp/Makefile
     ! fixed hardcoded for windows shortcut (Change~1) ChangeLog name
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 464b06cecb..6297831c2e 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -360,7 +360,53 @@ HB_STATIC="${hb_static}"
 HB_MT=""
 HB_GT="${HB_GT_LIB#gt}"
 
-HB_GPM_MOUSE="${HB_GPM_MOUSE}"
+if [ -z "$HB_GPM_MOUSE" ]; then
+    if [ "$HB_ARCHITECTURE" = "linux" ] && \
+       ( [ -f /usr/include/gpm.h ] || [ -f /usr/local/include/gpm.h ]); then
+        HB_GPM_MOUSE=yes
+    else
+        HB_GPM_MOUSE=no
+    fi
+    export HB_GPM_MOUSE
+fi
+
+if [ -z "${HB_WITHOUT_GTSLN}" ]; then
+    HB_WITHOUT_GTSLN=yes
+    case "$HB_ARCHITECTURE" in
+        linux|bsd|darwin|hpux|sunos)
+            for dir in /usr /usr/local /sw /opt/local
+            do
+                if [ -f ${dir}/include/slang.h ] || \
+                   [ -f ${dir}/include/slang/slang.h ]; then
+                    HB_WITHOUT_GTSLN=no
+                fi
+            done
+            ;;
+    esac
+fi
+
+if [ -z "${HB_WITHOUT_GTCRS}" ]; then
+    HB_WITHOUT_GTCRS=yes
+    case "$HB_ARCHITECTURE" in
+        linux|bsd|darwin|hpux|sunos)
+            for dir in /usr /usr/local /sw /opt/local
+            do
+                if [ -f ${dir}/include/curses.h ]; then
+                    HB_WITHOUT_GTCRS=no
+                fi
+            done
+            ;;
+    esac
+fi
+
+if [ -z "$HB_COMMERCE" ]; then
+    HB_COMMERCE=no;
+fi
+
+if [ "$HB_COMMERCE" = yes ]; then
+    HB_GPM_MOUSE=no
+    HB_WITHOUT_GTSLN=yes
+fi
 
 HB_GT_REQ=""
 HB_STRIP="yes"
diff --git a/harbour/config/djg-make.exe b/harbour/config/djg-make.exe
index f17394cd69..2cf8eaf844 100644
Binary files a/harbour/config/djg-make.exe and b/harbour/config/djg-make.exe differ
diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh
index a13bd9fa1e..0b68068b4f 100755
--- a/harbour/make_gnu.sh
+++ b/harbour/make_gnu.sh
@@ -62,61 +62,6 @@ then
     export HB_ARCHITECTURE=win
 fi
 
-if [ -z "$HB_GPM_MOUSE" ]; then
-    if [ "$HB_ARCHITECTURE" = "linux" ] && \
-       ( [ -f /usr/include/gpm.h ] || [ -f /usr/local/include/gpm.h ]); then
-        HB_GPM_MOUSE=yes
-    else
-        HB_GPM_MOUSE=no
-    fi
-    export HB_GPM_MOUSE
-fi
-
-if [ -z "${HB_WITHOUT_GTSLN}" ]; then
-    HB_WITHOUT_GTSLN=yes
-    case "$HB_ARCHITECTURE" in
-        linux|bsd|darwin|hpux|sunos)
-            for dir in /usr /usr/local /sw /opt/local
-            do
-                if [ -f ${dir}/include/slang.h ] || \
-                   [ -f ${dir}/include/slang/slang.h ]; then
-                    HB_WITHOUT_GTSLN=no
-                fi
-            done
-            ;;
-    esac
-    export HB_WITHOUT_GTSLN
-fi
-
-if [ -z "${HB_WITHOUT_GTCRS}" ]; then
-    HB_WITHOUT_GTCRS=yes
-    case "$HB_ARCHITECTURE" in
-        linux|bsd|darwin|hpux|sunos)
-            for dir in /usr /usr/local /sw /opt/local
-            do
-                if [ -f ${dir}/include/curses.h ] || \
-                   [ -f ${dir}/include/ncurses.h ] || \
-                   [ -f ${dir}/include/ncurses/ncurses.h ]; then
-                    HB_WITHOUT_GTCRS=no
-                fi
-            done
-            ;;
-    esac
-    export HB_WITHOUT_GTCRS
-fi
-
-if [ -z "$HB_COMMERCE" ]; then export HB_COMMERCE=no; fi
-
-if [ "$HB_COMMERCE" = yes ]
-then
-    export HB_GPM_MOUSE=no
-    export HB_WITHOUT_GTSLN=yes
-fi
-
-# export HB_USER_PRGFLAGS=
-# export HB_USER_CFLAGS=
-# export HB_USER_LDFLAGS=
-
 if [ "$HB_ARCHITECTURE" = "linux" ]
 then
     if [ "${HB_USER_CFLAGS}" == "${HB_USER_CFLAGS//-fPIC/}" ]
diff --git a/harbour/source/rtl/gtcrs/Makefile b/harbour/source/rtl/gtcrs/Makefile
index caa44654cb..221b51cf8a 100644
--- a/harbour/source/rtl/gtcrs/Makefile
+++ b/harbour/source/rtl/gtcrs/Makefile
@@ -14,7 +14,7 @@ ifeq ($(HB_XBUILD),)
 ifeq ($(HB_NCURSES_194),yes)
 HB_INC_CURSES = /usr/include/ncur194
 else
-HB_INC_CURSES = /usr/include /usr/include/ncurses /usr/local/include /usr/local/include/ncurses /sw/include /sw/include/ncurses /opt/local/include /opt/local/include/ncurses
+HB_INC_CURSES = /usr/include /usr/local/include /sw/include /opt/local/include
 endif
 endif
 endif