diff --git a/include/boost/config/auto_link.hpp b/include/boost/config/auto_link.hpp
index f4910427..df58d4f9 100644
--- a/include/boost/config/auto_link.hpp
+++ b/include/boost/config/auto_link.hpp
@@ -130,11 +130,16 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
    // vc71:
 #  define BOOST_LIB_TOOLSET "vc71"
 
-#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1400)
+#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1400)
 
    // vc80:
 #  define BOOST_LIB_TOOLSET "vc80"
 
+#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1500)
+
+   // vc90:
+#  define BOOST_LIB_TOOLSET "vc90"
+
 #elif defined(__BORLANDC__)
 
    // CBuilder 6:
diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp
index b5e06f60..233fdb9f 100644
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -72,6 +72,9 @@
 
 #if _MSC_VER <= 1400  // 1400 == VC++ 8.0
 #  define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+#endif
+
+#if _MSC_VER <= 1500  // 1500 == VC++ 9.0
 #  define BOOST_NO_TWO_PHASE_NAME_LOOKUP
 #endif
 
@@ -156,6 +159,8 @@
 #     define BOOST_COMPILER_VERSION 7.1
 #   elif _MSC_VER == 1400
 #     define BOOST_COMPILER_VERSION 8.0
+#   elif _MSC_VER == 1500
+#     define BOOST_COMPILER_VERSION 9.0
 #   else
 #     define BOOST_COMPILER_VERSION _MSC_VER
 #   endif
@@ -171,7 +176,7 @@
 #endif
 //
 // last known and checked version is 1400 (VC8):
-#if (_MSC_VER > 1400)
+#if (_MSC_VER > 1500)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  else