diff --git a/include/boost/config/auto_link.hpp b/include/boost/config/auto_link.hpp
index 64dee1ef1..6d6df683d 100644
--- a/include/boost/config/auto_link.hpp
+++ b/include/boost/config/auto_link.hpp
@@ -187,11 +187,16 @@ BOOST_LIB_SUFFIX:     Static/import libraries extension (".lib", ".a") for the c
      // vc14.2:
 #    define BOOST_LIB_TOOLSET "vc142"
 
-#  elif defined(BOOST_MSVC)
+#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1940) 
 
      // vc14.3:
 #    define BOOST_LIB_TOOLSET "vc143"
 
+#  elif defined(BOOST_MSVC)
+
+     // vc14.4
+#    define BOOST_LIB_TOOLSET "vc144"
+
 #  elif defined(BOOST_EMBTC_WINDOWS)
 
      // Embarcadero Clang based compilers: