diff --git a/v2/build/configure.jam b/v2/build/configure.jam
index 3edf98c89..c9a09b8c0 100644
--- a/v2/build/configure.jam
+++ b/v2/build/configure.jam
@@ -191,7 +191,10 @@ class check-target-builds-worker
     {
         # FIXME: this should not be hardcoded. Other checks might
         # want to consider different set of features as relevant.
-        local relevant = [ property.select <target-os> <toolset> <address-model> <architecture>
+        local toolset = [ property.select <toolset> : $(properties) ] ;
+        local toolset-version-property = "<toolset-$(toolset:G=):version>" ;
+        local relevant = [ property.select <target-os> <toolset> $(toolset-version-property)
+            <address-model> <architecture>
             : $(properties) ] ;
         local ps = [ property-set.create $(relevant) ] ;        
         local t = [ targets.current ] ;
diff --git a/v2/build/configure.py b/v2/build/configure.py
index 2c3e0534e..0426832c4 100644
--- a/v2/build/configure.py
+++ b/v2/build/configure.py
@@ -137,8 +137,11 @@ class CheckTargetBuildsWorker:
         
         # FIXME: this should not be hardcoded. Other checks might
         # want to consider different set of features as relevant.
+        toolset = ps.get('toolset')[0]
+        toolset_version_property = "<toolset-" + toolset + ":version>" ;
         relevant = ps.get_properties('target-os') + \
                    ps.get_properties("toolset") + \
+                   ps.get_properties(toolset_version_property) + \
                    ps.get_properties("address-model") + \
                    ps.get_properties("architecture")
         rps = property_set.create(relevant)