diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0f8e273212..efa2b5cab3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-28 17:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * make_gnu.sh
+    ! Restored old sln/crs detection code, to fix creation of hbmk.cfg.
+      I'll try to remove the need for this content in hbmk.cfg, but
+      I don't know how yet (maybe by checking for gtsln/gtcrs/gtxwc libs
+      in lib dir would be the best, if they are there, we must assume the
+      dynamic lib has them, too). This way hbmk2 setup becomes fully dynamic.
+
 2009-07-28 17:21 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rtl/hbsocket.c
     * accept NULL and empty string "" as default address (INADDR_ANY)
diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh
index df7eb7fd08..30b8b5f683 100755
--- a/harbour/make_gnu.sh
+++ b/harbour/make_gnu.sh
@@ -61,6 +61,39 @@ if [ -z "$HB_GPM_MOUSE" ]; then
     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 [ "$HB_ARCHITECTURE" = "linux" ]
 then
     if [ "${HB_USER_CFLAGS}" == "${HB_USER_CFLAGS//-fPIC/}" ]