diff --git a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
index 37c2fb1daa5..cbcfe3f48ae 100644
--- a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
+++ b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
@@ -8,7 +8,13 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED )
     set(CGAL_AUTO_LINK_ENABLED TRUE)
   endif()
 
-  if ( MSVC11 )  
+  if ( MSVC13 )  
+    set(CGAL_TOOLSET "vc130")
+    message( STATUS "Using VC13 compiler." )
+  elseif ( MSVC12 )  
+    set(CGAL_TOOLSET "vc120")
+    message( STATUS "Using VC12 compiler." )
+  elsif ( MSVC11 )  
     set(CGAL_TOOLSET "vc110")
     message( STATUS "Using VC11 compiler." )
   elseif ( MSVC10 )  
diff --git a/Installation/include/CGAL/auto_link/auto_link.h b/Installation/include/CGAL/auto_link/auto_link.h
index cb98f6a38e7..79ed248cd02 100644
--- a/Installation/include/CGAL/auto_link/auto_link.h
+++ b/Installation/include/CGAL/auto_link/auto_link.h
@@ -165,6 +165,16 @@ CGAL_VERSION:        Defined in <CGAL/version.h>
    // vc11:
 #  define CGAL_LIB_TOOLSET "vc110"
 
+#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1800)
+
+   // vc12:
+#  define CGAL_LIB_TOOLSET "vc120"
+
+#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1900)
+
+   // vc13:
+#  define CGAL_LIB_TOOLSET "vc130"
+
 #elif defined(__BORLANDC__)
 
    // CBuilder 6: