diff --git a/include/boost/config/auto_link.hpp b/include/boost/config/auto_link.hpp
index 13cbad43..ae3ba1bd 100644
--- a/include/boost/config/auto_link.hpp
+++ b/include/boost/config/auto_link.hpp
@@ -156,11 +156,16 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
      // vc11:
 #    define BOOST_LIB_TOOLSET "vc110"
 
-#  elif defined(BOOST_MSVC)
+#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1900)
 
      // vc12:
 #    define BOOST_LIB_TOOLSET "vc120"
 
+# elif defined(BOOST_MSVC)
+
+   // vc14:
+#  define BOOST_LIB_TOOLSET "vc140"
+
 #  elif defined(__BORLANDC__)
 
      // CBuilder 6:
diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp
index 42dabf0d..41bb5fe0 100644
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -227,6 +227,8 @@
 #     define BOOST_COMPILER_VERSION evc11 
 #   elif _MSC_VER < 1900 
 #     define BOOST_COMPILER_VERSION evc12
+#   elif _MSC_VER < 2000  
+#     define BOOST_COMPILER_VERSION evc14
 #   else
 #      if defined(BOOST_ASSERT_CONFIG)
 #         error "Unknown EVC++ compiler version - please run the configure tests and report the results"
@@ -265,8 +267,8 @@
 #endif
 
 //
-// last known and checked version is 19.00.21901.1 (VC14 CTP2):
-#if (_MSC_VER > 1800 && _MSC_FULL_VER > 190021901)
+// last known and checked version is 19.00.21901.1 (VC14 CTP3):
+#if (_MSC_VER > 1800 && _MSC_FULL_VER > 190022013)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  else