diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c0cd3c4f4d..6087f63bd7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,24 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-09-14 03:25 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/harbour-ce-spec
+  * harbour/harbour-w32-spec
+  * harbour/harbour.spec
+    + added harbour MT libraries: libfmmt and libhbvmmt
+
+  * harbour/include/hbstack.h
+    ! respect HB_USE_TLS defined in hbthread.h
+
+  * harbour/bin/hb-func.sh
+    * always create harbourmt shared library in non DOS builds
+
+  * harbour/bin/postinst.sh
+    * always create libfmmt in non DOS builds
+
+  * harbour/source/vm/Makefile
+    * always create libhbvmmt in non DOS builds
+
 2008-09-13 18:49 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbpp.h
   * harbour/include/hbvm.h
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 6ff58e720f..b3b2f95b50 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -719,7 +719,7 @@ mk_hblibso()
     fi
     echo "Making ${full_lib_name}..."
     ${hb_mkslib} ${full_lib_name} $LIBS ${linker_options}
-    if [ "$HB_MT" = "MT" ]; then
+    if [ "${HB_ARCHITECTURE}" != "dos" ]; then
         echo "Making ${full_lib_name_mt}..."
         ${hb_mkslib} ${full_lib_name_mt} $LIBSMT ${linker_options}
     fi
diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh
index 7c1bf2ad5a..0a37a94c9a 100755
--- a/harbour/bin/postinst.sh
+++ b/harbour/bin/postinst.sh
@@ -89,7 +89,7 @@ then
     ${AR} ${AR_OPT} ${HB_LIB_INSTALL}/libhbfm.a fm.o
     [ -n "${RANLIB}" ] && ${RANLIB} ${HB_LIB_INSTALL}/libhbfm.a
     rm -f fm.o
-    if [ "${HB_MT}" = "MT" ]; then
+    if [ "${HB_ARCHITECTURE}" != "dos" ]; then
         cd vmmt
         ${MAKE} -r fm.o
         ${AR} ${AR_OPT} ${HB_LIB_INSTALL}/libhbfmmt.a fm.o
diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec
index 9b19b2c0e0..9046eefb51 100644
--- a/harbour/harbour-ce-spec
+++ b/harbour/harbour-ce-spec
@@ -111,7 +111,6 @@ export CCPATH="%{hb_ccpath}:"
 export CCPREFIX="%{hb_ccpref}"
 export PATH="$CCPATH$PATH"
 
-export HB_MT=no
 export HB_XBUILD=wce
 export HB_GT_LIB=gtwvt
 export HB_BIN_INSTALL=%{_bindir}
@@ -142,7 +141,6 @@ export PATH="$CCPATH$PATH"
 export HB_HOST_BUILD=lib
 export HB_ARCHITECTURE=w32
 export HB_COMPILER=mingwce
-export HB_MT=no
 export HB_XBUILD=wce
 export HB_GT_LIB=gtwvt
 export HB_BIN_INSTALL=%{_bindir}
@@ -309,6 +307,7 @@ rm -fR $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libhbcplr.a
 %{_libdir}/%{name}/libhbdebug.a
 %{_libdir}/%{name}/libhbfm.a
+%{_libdir}/%{name}/libhbfmmt.a
 %{_libdir}/%{name}/librddfpt.a
 %{_libdir}/%{name}/librddcdx.a
 %{_libdir}/%{name}/librddntx.a
@@ -325,6 +324,7 @@ rm -fR $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libhbsix.a
 %{_libdir}/%{name}/libhbrtl.a
 %{_libdir}/%{name}/libhbvm.a
+%{_libdir}/%{name}/libhbvmmt.a
 %{_libdir}/%{name}/libhbmainstd.a
 %{_libdir}/%{name}/libhbmainwin.a
 %{_libdir}/%{name}/libhbusrrdd.a
diff --git a/harbour/harbour-w32-spec b/harbour/harbour-w32-spec
index 5efa44c0b2..133467b13d 100644
--- a/harbour/harbour-w32-spec
+++ b/harbour/harbour-w32-spec
@@ -111,7 +111,6 @@ export CCPATH="%{hb_ccpath}:"
 export CCPREFIX="%{hb_ccpref}"
 export PATH="$CCPATH$PATH"
 
-export HB_MT=no
 export HB_XBUILD=w32
 export HB_GT_LIB=gtwin
 export HB_BIN_INSTALL=%{_bindir}
@@ -142,7 +141,6 @@ export PATH="$CCPATH$PATH"
 export HB_HOST_BUILD=lib
 export HB_ARCHITECTURE=w32
 export HB_COMPILER=mingw32
-export HB_MT=no
 export HB_XBUILD=w32
 export HB_GT_LIB=gtwin
 export HB_BIN_INSTALL=%{_bindir}
@@ -309,6 +307,7 @@ rm -fR $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libhbcplr.a
 %{_libdir}/%{name}/libhbdebug.a
 %{_libdir}/%{name}/libhbfm.a
+%{_libdir}/%{name}/libhbfmmt.a
 %{_libdir}/%{name}/librddfpt.a
 %{_libdir}/%{name}/librddcdx.a
 %{_libdir}/%{name}/librddntx.a
@@ -325,6 +324,7 @@ rm -fR $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libhbsix.a
 %{_libdir}/%{name}/libhbrtl.a
 %{_libdir}/%{name}/libhbvm.a
+%{_libdir}/%{name}/libhbvmmt.a
 %{_libdir}/%{name}/libhbmainstd.a
 %{_libdir}/%{name}/libhbusrrdd.a
 
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index a84c88ad8b..5ef5cd2c1c 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -69,7 +69,6 @@
 %define hb_cc    export HB_COMPILER=gcc
 %define hb_cflag export C_USR="-O3 -DHB_FM_STATISTICS_OFF"
 %define hb_lflag export L_USR="${CC_L_USR} %{?_with_static:-static}"
-%define hb_mt    export HB_MT=no
 %define hb_gt    export HB_GT_LIB=gttrm
 %define hb_defgt export HB_GT_DEFAULT="${HB_GT_DEFAULT}"
 %define hb_gpm   export HB_GPM_MOUSE=%{!?_without_gpm:yes}
@@ -81,7 +80,7 @@
 %define hb_ldir  export HB_LIB_INSTALL=%{_libdir}/%{name}
 %define hb_cmrc  export HB_COMMERCE=%{?_without_gpllib:yes}
 %define hb_ctrb  export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbsqlit3 hbtip hbtpathy hbvpdf hbziparc xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_hbhpdf:hbhpdf} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}"
-%define hb_env   %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_mt} ; %{hb_gt} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ctrb} ; %{hb_cmrc}
+%define hb_env   %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_gt} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ctrb} ; %{hb_cmrc}
 %define hb_host  www.harbour-project.org
 %define readme   README.RPM
 ######################################################################
@@ -611,6 +610,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libhbcplr.a
 %{_libdir}/%{name}/libhbdebug.a
 %{_libdir}/%{name}/libhbfm.a
+%{_libdir}/%{name}/libhbfmmt.a
 %{_libdir}/%{name}/librddfpt.a
 %{_libdir}/%{name}/librddcdx.a
 %{_libdir}/%{name}/librddntx.a
@@ -627,6 +627,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libhbsix.a
 %{_libdir}/%{name}/libhbrtl.a
 %{_libdir}/%{name}/libhbvm.a
+%{_libdir}/%{name}/libhbvmmt.a
 %{_libdir}/%{name}/libhbusrrdd.a
 
 %files contrib
diff --git a/harbour/include/hbstack.h b/harbour/include/hbstack.h
index 1b5a5523ef..9613bdf45b 100644
--- a/harbour/include/hbstack.h
+++ b/harbour/include/hbstack.h
@@ -63,9 +63,7 @@
 HB_EXTERN_BEGIN
 
 #if defined( HB_MT_VM )
-#  if defined( HB_USE_TLS )
-#     include "hbthread.h"
-#  endif
+#  include "hbthread.h"
 #  if !defined( HB_USE_TLS )
 #     undef HB_STACK_MACROS
 #  endif
diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile
index ab1f1d5194..776ddc1616 100644
--- a/harbour/source/vm/Makefile
+++ b/harbour/source/vm/Makefile
@@ -67,10 +67,8 @@ PRG_SOURCES=\
 LIBNAME=hbvm
 
 ifeq ($(HB_MT),)
-ifneq ($(C_USR),$(subst -DHB_MT_VM,,$(C_USR)))
-   C_USR:=$(subst -DHB_MT_VM,,$(C_USR))
    HB_MT=MT
-endif
+   C_USR:=$(subst -DHB_MT_VM,,$(C_USR))
 endif
 ifeq ($(HB_MT),MT)
 ifneq ($(HB_ARCHITECTURE),dos)