diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 28e5cb7f07..3ede281dac 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-09-14 19:59 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * make_b32.mak
+    + Now setting 'HB_BUILD_ST = no' will generate an MT build.
+      TODO: Change the default to 'yes' should be the way to go 
+            IMO.
+
+  * bin/bld.bat
+    + Added cw32mt.lib for BCC32 to make it work for MT Harbour.
+    ; I hope this won't break ST Harbour builds, a quick tests 
+      proved not.
+
 2008-09-14 19:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * make_b32.mak
   * make_vc.mak
@@ -37,7 +48,6 @@
 
   * contrib/hbnf/common.mak
     ! File list synced with the GNU-make one.
-      [TOMERGE 1.0]
 
   * source/common/hbver.c
     * "Intl." removed from the version number. Besides mimicing 
diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat
index e6152cb0e5..93741d608d 100644
--- a/harbour/bin/bld.bat
+++ b/harbour/bin/bld.bat
@@ -179,7 +179,7 @@ if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2
 
    if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtwin
 
-   if "%HB_COMPILER%" == "bcc32"   bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib %_HB_GT_LIB%.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddfpt.lib rddntx.lib rddcdx.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib
+   if "%HB_COMPILER%" == "bcc32"   bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c cw32mt.lib %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib %_HB_GT_LIB%.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddfpt.lib rddntx.lib rddcdx.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib
 
    if "%HB_COMPILER%" == "gcc"     gcc %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm -lhbrtl -l%_HB_GT_LIB% -lhblang -lhbrdd -lhbrtl -lhbvm -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib
    if "%HB_COMPILER%" == "mingw"   gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% %HB_INC_TEMP% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm -lhbrtl -l%_HB_GT_LIB% -lhblang -lhbrdd -lhbrtl -lhbvm -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib
diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak
index e73046dfab..1bfa6e2c4f 100644
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -120,7 +120,7 @@ CFLAGS = -I$(INCLUDE_DIR) -I$(OBJ_DIR) $(C_USR)
 !endif
 #-----------
 !if "$(HB_BUILD_ST)" != "yes"
-    CFLAGS = -tWM $(CFLAGS)
+    CFLAGS = -tWM $(CFLAGS) -DHB_MT_VM
 !endif
 #-----------
 !if "$(HB_GT_DEFAULT)" != ""
@@ -158,6 +158,10 @@ LDFLAGSDLL     = -Gn -C -aa -Tpd -Gi -L$(LIB_DIR) $(LDFLAGSDLL)
 
 #**********************************************************
 
+!if "$(HB_BUILD_ST)" != "yes"
+    STANDARD_STATIC_CLIBS = cw32mt$(RTLIBSUFFIX).lib
+!endif
+
 # This is needed, otherwise the libs may overflow
 # when debug info is requested with -v -y
 ARFLAGS = /P32 $(A_USR)
@@ -481,6 +485,7 @@ $(CFLAGS)
 -e$(HBRUN_EXE)
 $(**: = ^
 )
+$(STANDARD_STATIC_CLIBS)
 $(STANDARD_STATIC_HBLIBS)
 !
 #**********************************************************
@@ -494,6 +499,7 @@ $(CFLAGS)
 -e$(HBTEST_EXE)
 $(**: = ^
 )
+$(STANDARD_STATIC_CLIBS)
 $(STANDARD_STATIC_HBLIBS)
 !
 #**********************************************************
@@ -507,6 +513,7 @@ $(CFLAGS)
 -e$(HBDOC_EXE)
 $(**: = ^
 )
+$(STANDARD_STATIC_CLIBS)
 $(MINIMAL_STATIC_HBLIBS) $(HBDOC_LIBS)
 !
 #**********************************************************
@@ -520,6 +527,7 @@ $(CFLAGS)
 -e$(HBMAKE_EXE)
 $(**: = ^
 )
+$(STANDARD_STATIC_CLIBS)
 $(MINIMAL_STATIC_HBLIBS)
 !
 #**********************************************************