Index: msvc.jam
===================================================================
--- msvc.jam	(revision 53158)
+++ msvc.jam	(working copy)
@@ -677,11 +677,15 @@
             # version from the path.
             # FIXME: We currently detect both Microsoft Visual Studio 9.0 and
             # 9.0express as 9.0 here.
-            if [ MATCH "(Microsoft Visual Studio 9)" : $(command) ]
+            if [ MATCH "(Microsoft Visual Studio 10)" : $(command) ]
             {
+                version = 10.0 ;
+            }
+            else if [ MATCH "(Microsoft Visual Studio 9)" : $(command) ]
+            {
                 version = 9.0 ;
             }
-            if [ MATCH "(Microsoft Visual Studio 8)" : $(command) ]
+            else if [ MATCH "(Microsoft Visual Studio 8)" : $(command) ]
             {
                 version = 8.0 ;
             }
@@ -1266,7 +1270,7 @@
 
 
 # Known toolset versions, in order of preference.
-.known-versions = 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;
+.known-versions = 10.0 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;
 
 # Version aliases.
 .version-alias-6 = 6.0 ;
@@ -1274,6 +1278,7 @@
 .version-alias-7 = 7.0 ;
 .version-alias-8 = 8.0 ;
 .version-alias-9 = 9.0 ;
+.version-alias-10 = 10.0 ;
 
 # Names of registry keys containing the Visual C++ installation path (relative
 # to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft").
@@ -1284,6 +1289,7 @@
 .version-8.0express-reg = "VCExpress\\8.0\\Setup\\VC" ;
 .version-9.0-reg = "VisualStudio\\9.0\\Setup\\VC" ;
 .version-9.0express-reg = "VCExpress\\9.0\\Setup\\VC" ;
+.version-10.0-reg = "VisualStudio\\10.0\\Setup\\VC" ;
 
 # Visual C++ Toolkit 2003 does not store its installation path in the registry.
 # The environment variable 'VCToolkitInstallDir' and the default installation