diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0231124d98..2cdbc5684b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-29 13:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * harbour.spec
+  * harbour-win-spec
+  * harbour-wce-spec
+  * mpkg_rpm.sh
+  * mpkg_rpm_win.sh
+  * mpkg_rpm_wce.sh
+    % Deleted special logic to disable hbnf lib.
+
 2009-11-29 13:46 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/mpkg_rpm.sh
     ! check if QT4 is in version 4.5 or newer
diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec
index 0078991d65..9d28036a78 100644
--- a/harbour/harbour-wce-spec
+++ b/harbour/harbour-wce-spec
@@ -17,7 +17,6 @@
 # --with allegro     - build gtalleg - Allegro based GT driver
 # --with ads         - build rddads
 # --with odbc        - build odbc lib
-# --without hbnf     - do not build hbnf lib (nanforum lib)
 ######################################################################
 
 ######################################################################
@@ -139,7 +138,6 @@ make install %{?_smp_mflags}
 [ "%{?_with_odbc:1}" ]    || rm -f $HB_LIB_INSTALL/libhbodbc.a
 [ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a
 [ "%{?_with_ads:1}" ]     || rm -f $HB_LIB_INSTALL/librddads.a
-[ "%{?_without_hbnf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a
 
 # remove unused files
 rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbmk2,hbrun,hbi18n,hbtest}.exe
diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec
index 53a2a15c5f..227996714b 100644
--- a/harbour/harbour-win-spec
+++ b/harbour/harbour-win-spec
@@ -17,7 +17,6 @@
 # --with allegro     - build gtalleg - Allegro based GT driver
 # --with ads         - build rddads
 # --with odbc        - build odbc lib
-# --without hbnf     - do not build hbnf lib (nanforum lib)
 ######################################################################
 
 ######################################################################
@@ -139,7 +138,6 @@ make install %{?_smp_mflags}
 [ "%{?_with_odbc:1}" ]    || rm -f $HB_LIB_INSTALL/libhbodbc.a
 [ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a
 [ "%{?_with_ads:1}" ]     || rm -f $HB_LIB_INSTALL/librddads.a
-[ "%{?_without_hbnf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a
 
 # remove unused files
 rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbmk2,hbrun,hbi18n,hbtest}.exe
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index 3ce1ca8239..282f34f0f8 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -85,7 +85,7 @@
 %define hb_ldir  export HB_LIB_INSTALL=%{_libdir}/%{name}
 %define hb_edir  export HB_ETC_INSTALL=%{hb_etcdir}
 %define hb_cmrc  export HB_COMMERCE=%{?_without_gpllib:yes}
-%define hb_ctrb  export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbsms hbziparc xhb rddsql %{!?_without_hbnf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_firebird:hbfbird} %{?_with_allegro:gtalleg} %{?_with_qt:hbqt hbxbp}"
+%define hb_ctrb  export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbsms hbziparc xhb rddsql hbnf %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_firebird:hbfbird} %{?_with_allegro:gtalleg} %{?_with_qt:hbqt hbxbp}"
 %define hb_env   %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_edir} ; %{hb_ctrb} ; %{hb_cmrc}
 %define hb_host  www.harbour-project.org
 %define readme   README.RPM
@@ -622,7 +622,7 @@ rm -rf $RPM_BUILD_ROOT
 %files contrib
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}
-%{!?_without_hbnf: %{_libdir}/%{name}/libhbnf.a}
+%{_libdir}/%{name}/libhbnf.a
 %{_libdir}/%{name}/libhbbtree.a
 %{_libdir}/%{name}/libhbmisc.a
 %{_libdir}/%{name}/libhbmzip.a
diff --git a/harbour/mpkg_rpm.sh b/harbour/mpkg_rpm.sh
index 91c8cf3b8b..91ffba994a 100755
--- a/harbour/mpkg_rpm.sh
+++ b/harbour/mpkg_rpm.sh
@@ -25,7 +25,6 @@
 # --with localzlib   - build local copy of zlib library
 # --with localpcre   - build local copy of pcre library
 # --without gpllib   - do not build libs which needs GPL 3rd party code
-# --without hbnf     - do not build hbnf lib (nanforum lib)
 # --without x11      - do not build gtxwc
 # --without gpm      - build gttrm, gtsln and gtcrs without gpm support
 # --without curses   - do not build gtcrs
diff --git a/harbour/mpkg_rpm_wce.sh b/harbour/mpkg_rpm_wce.sh
index 2393c1a41b..fa0e33a500 100755
--- a/harbour/mpkg_rpm_wce.sh
+++ b/harbour/mpkg_rpm_wce.sh
@@ -19,7 +19,6 @@
 # --with allegro     - build GTALLEG - Allegro based GT driver
 # --with ads         - build ADS RDD
 # --without odbc     - do not build odbc lib
-# --without hbnf     - do not build hbnf lib (nanforum lib)
 ######################################################################
 
 test_reqrpm()
diff --git a/harbour/mpkg_rpm_win.sh b/harbour/mpkg_rpm_win.sh
index eebeb7db5a..af602b75e3 100755
--- a/harbour/mpkg_rpm_win.sh
+++ b/harbour/mpkg_rpm_win.sh
@@ -19,7 +19,6 @@
 # --with allegro     - build GTALLEG - Allegro based GT driver
 # --with ads         - build ADS RDD
 # --without odbc     - do not build odbc lib
-# --without hbnf     - do not build hbnf lib (nanforum lib)
 ######################################################################
 
 test_reqrpm()