diff --git a/v1/boost-base.jam b/v1/boost-base.jam
index 286284e07..aa393fbd5 100644
--- a/v1/boost-base.jam
+++ b/v1/boost-base.jam
@@ -2418,6 +2418,7 @@ rule target-path-of ( target-ref )
 #       "y" when building debug-python variants
 #       "d" when building debug variants
 #       "p" when building with stlport libraries
+#       "n" when building with stlport and using native iostreams
 #
 # The tag added is a <tag><prefix> to allow for additional tags
 # in the stage. For example the version tag.
@@ -2434,7 +2435,10 @@ rule common-stage-tag ( toolset variant : properties * )
     if <runtime-build>debug in $(properties) { runtime-tag += g ; }
     if [ MATCH .*(debug-python).* : $(variant) ] { runtime-tag += y ; }
     else { if [ MATCH .*(debug).* : $(variant) ] { runtime-tag += d ; } }
-    if [ MATCH .*(stlport).* : $(toolset) ] { runtime-tag += p ; }
+    if [ MATCH .*(stlport).* : $(toolset) ] ||
+        [ MATCH .*(stlport).* : $(properties:G) ]
+    { runtime-tag += p ; }
+    if <stlport-iostream>off in $(properties) { runtime-tag += n ; }
     
     local toolset-tag = ;
     switch $(toolset)
@@ -2462,13 +2466,14 @@ rule common-stage-tag ( toolset variant : properties * )
         case *vacpp* : toolset-tag += xlc ;
         case *vc7* : 
         {
-            toolset-tag += vc ;
+            toolset-tag += vc7 ;
+            toolset-tag += [ MATCH "vc7[.]([0123456789]*)" : $(toolset) ] ;
             if <runtime-link>dynamic in $(properties) { thread-tag = mt ; }
         }
         case * :
         toolset-tag += [ MATCH "^([^-]*)" : $(toolset) ] ;
     }
-    toolset-tag += [ MATCH "[-c]([0123456789]+).([0123456789]*)" : $(toolset) ] ;
+    toolset-tag += [ MATCH "[-]([0123456789]+).([0123456789]*)" : $(toolset) ] ;
     
     tags += $(toolset-tag:J=) ;
     tags += $(thread-tag:J=) ;