diff --git a/v2/tools/common.jam b/v2/tools/common.jam
index 35fe34615..2e188742b 100644
--- a/v2/tools/common.jam
+++ b/v2/tools/common.jam
@@ -762,8 +762,19 @@ local rule runtime-tag ( name : type ? : property-set )
     
     local properties = [ $(property-set).raw ] ;
     if <runtime-link>static in $(properties) { tag += s ; }
-    if <runtime-debugging>on in $(properties) { tag += g ; }
     
+    # This is ugly thing. In V1, there's a code to automatically
+    # detect which properties affect a target. So, if 
+    # <runtime-debugging> does not affect gcc toolset, the
+    # tag rules won't even see <runtime-debugging>.
+    # Similar functionality in V2 is not implemented yet, so we just
+    # check for toolsets which are know to care about runtime debug
+    if <toolset>msvc in $(properties)
+      || <stdlib>stlport in $(properties)
+    {
+        if <runtime-debugging>on in $(properties) { tag += g ; }        
+    }
+      
     if <variant>debug-python in $(properties) { tag += y ; }
     if <variant>debug in $(properties) { tag += d ; }
     if <stdlib>stlport in $(properties) { tag += p ; }