diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6cc7d9b81c..b8b38da22c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-19 13:52 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-func.sh
+    ! fixed few problems introduced by macro name modifications and removed
+      some wrong RT checking
+
+  * harbour/bin/hb-func.sh
+  * harbour/source/common/hbprintf.c
+  * harbour/source/rtl/fstemp.c
+  * harbour/config/bsd/libs.mk
+    * updated for NetBSD builds
+
 2009-09-19 13:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     * HB_INC_* -> HB_WITH_*. This is now the new documented (pbly
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 090f41b62d..d01f8f0eba 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -221,8 +221,8 @@ mk_hbtools()
     elif [ "${HB_COMPILER}" = "djgpp" ]; then
         HB_SYS_LIBS="${HB_SYS_LIBS}"
         HB_INC_X11="no"
+        HB_LIBNAME_CURSES="pdcurses"
     else
-        HB_LIBNAME_CURSES=""
         if [ "${HB_PLATFORM}" = "linux" ]; then
             HB_SYS_LIBS="${HB_SYS_LIBS} -ldl -lrt"
         elif [ "${HB_PLATFORM}" = "sunos" ]; then
@@ -231,6 +231,8 @@ mk_hbtools()
             HB_LIBNAME_CURSES="curses"
         elif [ "${HB_PLATFORM}" = "hpux" ]; then
             HB_SYS_LIBS="${HB_SYS_LIBS} -lrt"
+        elif [ "${HB_PLATFORM}" = "bsd" ]; then
+            HB_LIBNAME_CURSES="curses"
         fi
         if [ -n "${HB_CURSES_VER}" ]; then
             HB_LIBNAME_CURSES="${HB_CURSES_VER}"
@@ -375,54 +377,6 @@ HB_STATIC="${hb_static}"
 HB_MT=""
 HB_GT="${HB_GT_LIB#gt}"
 
-if [ -z "$HB_INC_GPM" ]; then
-    if [ "$HB_PLATFORM" = "linux" ] && \\
-       ( [ -f /usr/include/gpm.h ] || [ -f /usr/local/include/gpm.h ]); then
-        HB_INC_GPM=yes
-    else
-        HB_INC_GPM=no
-    fi
-    export HB_INC_GPM
-fi
-
-if [ -z "${HB_INC_SLANG}" ]; then
-    HB_INC_SLANG=no
-    case "$HB_PLATFORM" 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_INC_SLANG=yes
-                fi
-            done
-            ;;
-    esac
-fi
-
-if [ -z "${HB_INC_CURSES}" ]; then
-    HB_INC_CURSES=no
-    case "$HB_PLATFORM" in
-        linux|bsd|darwin|hpux|sunos)
-            for dir in /usr /usr/local /sw /opt/local
-            do
-                if [ -f ${dir}/include/curses.h ]; then
-                    HB_INC_CURSES=yes
-                fi
-            done
-            ;;
-    esac
-fi
-
-if [ -z "$HB_COMMERCE" ]; then
-    HB_COMMERCE=no;
-fi
-
-if [ "$HB_COMMERCE" = yes ]; then
-    HB_INC_GPM=no
-    HB_INC_SLANG=no
-fi
-
 HB_GT_REQ=""
 HB_STRIP="yes"
 HB_MAIN_FUNC=""
@@ -522,13 +476,13 @@ GCC_PATHS="\${HB_PATHS} -L\${HB_LIB_INSTALL}"
 HB_GPM_LIB=""
 if [ -f "\${HB_LIB_INSTALL}/libgtsln.a" ]; then
     SYSTEM_LIBS="-l${HB_LIBNAME_SLANG:-slang} \${SYSTEM_LIBS}"
-    [ "\${HB_INC_GPM}" != "no" ] && HB_GPM_LIB="gpm"
+    [ "${HB_INC_GPM}" != "no" ] && HB_GPM_LIB="gpm"
 fi
 if [ -f "\${HB_LIB_INSTALL}/libgtcrs.a" ]; then
     SYSTEM_LIBS="-l${HB_LIBNAME_CURSES:-ncurses} \${SYSTEM_LIBS}"
-    [ "\${HB_INC_GPM}" != "no" ] && HB_GPM_LIB="gpm"
+    [ "${HB_INC_GPM}" != "no" ] && HB_GPM_LIB="gpm"
 fi
-if [ "\${HB_INC_X11}" != "no" ]; then
+if [ "${HB_INC_X11}" != "no" ]; then
     if [ -f "\${HB_LIB_INSTALL}/libgtxvt.a" ] || [ -f "\${HB_LIB_INSTALL}/libgtxwc.a" ]; then
         [ -d "/usr/X11R6/lib64" ] && SYSTEM_LPATHS="\${SYSTEM_LPATHS} -L/usr/X11R6/lib64"
         [ -d "/usr/X11R6/lib" ]   && SYSTEM_LPATHS="\${SYSTEM_LPATHS} -L/usr/X11R6/lib"
@@ -897,15 +851,14 @@ mk_hblibso()
                 then
                     LIBS="$LIBS $ls"
                     if [ "${l}" = gtcrs ]; then
-                        if [ "${HB_PLATFORM}" = "sunos" ]; then
+                        if [ "${HB_PLATFORM}" = "sunos" ] || \
+                           [ "${HB_PLATFORM}" = "bsd" ]; then
                             linker_options="$linker_options -lcurses"
                         else
                             linker_options="$linker_options -lncurses"
                         fi
                     elif [ "${l}" = gtsln ]; then
-                        if [ "${HB_INC_SLANG}" != "no" ]; then
-                            linker_options="$linker_options -lslang"
-                        fi
+                        linker_options="$linker_options -lslang"
                     elif [ "${l}" = gtxwc ]; then
                         [ -d "/usr/X11R6/lib" ] && \
                            linker_options="$linker_options -L/usr/X11R6/lib"
diff --git a/harbour/config/bsd/libs.mk b/harbour/config/bsd/libs.mk
index fa8f6546fe..e61052a433 100644
--- a/harbour/config/bsd/libs.mk
+++ b/harbour/config/bsd/libs.mk
@@ -7,7 +7,7 @@ SYSLIBPATHS :=
 
 ifneq ($(HB_LINKING_RTL),)
    ifeq ($(HB_LIBNAME_CURSES),)
-      HB_LIBNAME_CURSES := ncurses
+      HB_LIBNAME_CURSES := curses
    endif
    ifneq ($(HB_HAS_CURSES),)
       SYSLIBS += $(HB_LIBNAME_CURSES)
diff --git a/harbour/source/common/hbprintf.c b/harbour/source/common/hbprintf.c
index 9f8fdb9d8e..cbbbc129a0 100644
--- a/harbour/source/common/hbprintf.c
+++ b/harbour/source/common/hbprintf.c
@@ -283,7 +283,7 @@ optimized.
 #  else
 #     define _x_long_dbl      long double
 #     if defined( __WATCOMC__ ) || defined( __MINGW32CE__ ) || defined( __CYGWIN__ ) || \
-         defined( HB_OS_BEOS ) || defined( __OpenBSD__ ) || \
+         defined( HB_OS_BEOS ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) || \
          ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) )
 #        define _HB_WRAP_MODFL_
 #        define _MODFD( x, p )   _hb_modfl( x, p )
diff --git a/harbour/source/rtl/fstemp.c b/harbour/source/rtl/fstemp.c
index cbf445538f..ee4c3cc35a 100644
--- a/harbour/source/rtl/fstemp.c
+++ b/harbour/source/rtl/fstemp.c
@@ -76,7 +76,8 @@
 #if ( defined( HB_OS_LINUX ) && !defined( __WATCOMC__ ) ) || \
     defined( HB_OS_BSD ) || defined( HB_OS_DARWIN ) || defined( HB_OS_SUNOS )
    #define HB_HAS_MKSTEMP
-   #if defined( HB_OS_BSD ) || defined( HB_OS_DARWIN )
+   #if ( defined( HB_OS_BSD ) && !defined( __NetBSD__ ) ) || \
+       defined( HB_OS_DARWIN )
       #define HB_HAS_MKSTEMPS
    #endif
 #endif