diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 556cd84554..cc93a98195 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-11-11 02:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * bin/hbmk.bat
+    + Added '-shared' support for MSVC.
+    ! Fixed to cleanup mainstd.obj and mainwin.obj.
+
+  * ChangeLog
+    * Some TODO/TOFIX marked as [DONE]. One [DONE] marked 
+      as [DONE - REOPENED].
+
 2008-11-11 02:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * make_b32.mak
   * make_vc.mak
@@ -32,9 +41,9 @@
 
   * bin/hbmk.bat
     + Added '-shared' option.
-    ; TOFIX: - '-shared' won't work in binary installations.
-             - '-shared' cannot create MT apps.
-             - '-shared' only works for BCC32 yet.
+    ; TOFIX: '-shared' won't work in binary installations.
+    ; TOFIX: '-shared' cannot create MT apps.
+    ; TOFIX: '-shared' only works for BCC32 yet. [DONE]
 
   - tests/hbmk_b32_dll.bat
     - Removed. Use 'hbmk_b32 -shared' instead.
@@ -165,9 +174,10 @@
   * source/vm/fm.c
     ! Fixed missing abort() on WinCE. (for Pelles C only, but 
       the fix should work for any WinCE compilers).
-    ; TOFIX: Now the only remaining showstopper for PellesC5 WinCE 
+    ; TOFIX: Now the only remaining showstopper for PellesC5 WinCE
              support is:
              ../../math.c(652): error #3120: [asm] Symbol 'inf' is undefined.
+             [DONE]
 
 2008-11-10 03:15 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * config/w32/poccce.cf
@@ -609,7 +619,7 @@
   * make_vc.mak
     + Added HBRUN_DLL.
     ; TOFIX: It doesn't work. Maybe more eyeballs will spot the 
-             problem more easily.
+             problem more easily. [DONE]
 
 2008-11-09 14:23 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * tests/longstr.prg
@@ -708,6 +718,7 @@
     * Excluded hbwmain for __POCC__ WinCE.
     ; TOFIX: Warning: Not proper fix.
              This way it won't link but at least it compiles.
+             [DONE]
 
   * source/compiler/gencc.c
     * Switched to hexadecimal format for high chars, because
@@ -911,7 +922,7 @@
     ! Fixed a few places where '+' operator was used
       instead of '|'.
     * Minor opt/formatting.
-    ; TOFIX: The window positioning bug is still to be solved. [DONE]
+    ; TOFIX: The window positioning bug is still to be solved. [DONE -> REOPENED]
 
 2008-11-07 23:39 UTC+0100 Francesco Saverio Giudice (info fsgiudice com)
   * source/rdd/usrrdd/rdds/arrayrdd.prg
diff --git a/harbour/bin/hbmk.bat b/harbour/bin/hbmk.bat
index 7abaef50f5..e13a27ad09 100644
--- a/harbour/bin/hbmk.bat
+++ b/harbour/bin/hbmk.bat
@@ -211,9 +211,11 @@ if "%_HB_MT%" == "MT"  set _HBVM_LIB=hbvmmt
 
    if not "%HB_COMPILER%" == "msvc" goto A_WIN_MSVC_NOT
 
-      if "%_HB_GUI%" == "yes" set _HB_USR_L=/subsystem:windows
+      if not "%_HB_GUI%" == "yes" set _HB_USR_L=/subsystem:console
+      if     "%_HB_GUI%" == "yes" set _HB_USR_L=/subsystem:windows
 
-      cl -nologo -W3 %C_USR% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /libpath:%HB_LIB_INSTALL% %L_USR% %_HB_USR_L% %HB_USER_LIBS% hbcpage.lib hbdebug.lib %_HBVM_LIB%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib
+      if not "%_HB_SHARED%" == "yes" cl -nologo -W3 %C_USR% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /libpath:%HB_LIB_INSTALL% %L_USR% %_HB_USR_L% %HB_USER_LIBS% hbcpage.lib hbdebug.lib %_HBVM_LIB%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib
+      if     "%_HB_SHARED%" == "yes" cl -nologo -W3 %C_USR% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c ..\source\vm\mainstd.c ..\source\vm\mainwin.c /link /libpath:%HB_LIB_INSTALL% %L_USR% %_HB_USR_L% %HB_USER_LIBS% harbour-11-vc.lib user32.lib wsock32.lib advapi32.lib gdi32.lib
       goto CLEANUP
 
 :A_WIN_MSVC_NOT
@@ -272,6 +274,8 @@ if "%_HB_MT%" == "MT"  set _HBVM_LIB=hbvmmt
    if exist %_HB_PRG_NAME%.c del %_HB_PRG_NAME%.c
    if exist %_HB_PRG_NAME%.o del %_HB_PRG_NAME%.o
    if exist %_HB_PRG_NAME%.obj del %_HB_PRG_NAME%.obj
+   if exist mainstd.obj del mainstd.obj
+   if exist mainwin.obj del mainwin.obj
    rem Borland stuff
    if exist %_HB_PRG_NAME%.tds del %_HB_PRG_NAME%.tds