diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 66c3255963..7d561f5cdd 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-05 15:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Deleted -MTd win/msvc compiler switch in -debug mode to not
+      leave it to the default settings and give users full control
+      of this.
+
 2009-08-05 10:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * bin/postinst.sh
   * make_gnu.sh
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 02f9a26dd6..386aea9bf7 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2759,11 +2759,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          ENDIF
 
          IF hbmk[ _HBMK_lDEBUG ]
-            IF hbmk[ _HBMK_cCOMP ] == "msvcarm"
-               AAdd( hbmk[ _HBMK_aOPTC ], "-Zi" )
-            ELSE
-               AAdd( hbmk[ _HBMK_aOPTC ], "-MTd -Zi" )
-            ENDIF
+            AAdd( hbmk[ _HBMK_aOPTC ], "-Zi" )
             AAdd( hbmk[ _HBMK_aOPTL ], "/debug" )
          ENDIF
          IF hbmk[ _HBMK_lGUI ]