Index: tools/build/v2/tools/msvc.jam
===================================================================
--- tools/build/v2/tools/msvc.jam	(revision 76005)
+++ tools/build/v2/tools/msvc.jam	(working copy)
@@ -736,8 +736,12 @@
             # 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 10)" : $(command) ]
+            if [ MATCH "(Microsoft Visual Studio 11)" : $(command) ]
             {
+                version = 11.0 ;
+            }
+            else if [ MATCH "(Microsoft Visual Studio 10)" : $(command) ]
+            {
                 version = 10.0 ;
             }
             else if [ MATCH "(Microsoft Visual Studio 9)" : $(command) ]
@@ -1351,7 +1355,7 @@
 
 
 # Known toolset versions, in order of preference.
-.known-versions = 10.0 10.0express 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;
+.known-versions = 11.0 10.0 10.0express 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;
 
 # Version aliases.
 .version-alias-6 = 6.0 ;
@@ -1360,6 +1364,7 @@
 .version-alias-8 = 8.0 ;
 .version-alias-9 = 9.0 ;
 .version-alias-10 = 10.0 ;
+.version-alias-11 = 11.0 ;
 
 # Names of registry keys containing the Visual C++ installation path (relative
 # to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft").
@@ -1372,6 +1377,7 @@
 .version-9.0express-reg = "VCExpress\\9.0\\Setup\\VC" ;
 .version-10.0-reg = "VisualStudio\\10.0\\Setup\\VC" ;
 .version-10.0express-reg = "VCExpress\\10.0\\Setup\\VC" ;
+.version-11.0-reg = "VisualStudio\\11.0\\Setup\\VC" ;
 
 # Visual C++ Toolkit 2003 does not store its installation path in the registry.
 # The environment variable 'VCToolkitInstallDir' and the default installation
Index: tools/build/v2/tools/msvc.py
===================================================================
--- tools/build/v2/tools/msvc.py	(revision 76005)
+++ tools/build/v2/tools/msvc.py	(working copy)
@@ -646,6 +646,8 @@
             # version from the path.
             # FIXME: We currently detect both Microsoft Visual Studio 9.0 and
             # 9.0express as 9.0 here.
+            if re.search("Microsoft Visual Studio 11", command):
+                version = '11.0'
             if re.search("Microsoft Visual Studio 10", command):
                 version = '10.0'
             elif re.search("Microsoft Visual Studio 9", command):
@@ -1154,7 +1156,7 @@
 
 
 # Known toolset versions, in order of preference.
-_known_versions = ['10.0', '10.0express', '9.0', '9.0express', '8.0', '8.0express', '7.1', '7.1toolkit', '7.0', '6.0']
+_known_versions = ['11.0', '10.0', '10.0express', '9.0', '9.0express', '8.0', '8.0express', '7.1', '7.1toolkit', '7.0', '6.0']
 
 # Version aliases.
 __version_alias_6 = '6.0'
@@ -1163,6 +1165,7 @@
 __version_alias_8 = '8.0'
 __version_alias_9 = '9.0'
 __version_alias_10 = '10.0'
+__version_alias_11 = '11.0'
 
 # Names of registry keys containing the Visual C++ installation path (relative
 # to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft").
@@ -1175,6 +1178,7 @@
 __version_9_0express_reg = "VCExpress\\9.0\\Setup\\VC"
 __version_10_0_reg = "VisualStudio\\10.0\\Setup\\VC"
 __version_10_0express_reg = "VCExpress\\10.0\\Setup\\VC"
+__version_11_0_reg = "VisualStudio\\11.0\\Setup\\VC"
 
 # Visual C++ Toolkit 2003 does not store its installation path in the registry.
 # The environment variable 'VCToolkitInstallDir' and the default installation