diff --git a/Installation/CHANGES b/Installation/CHANGES
index d635c2b084c..7e72f1c36c2 100644
--- a/Installation/CHANGES
+++ b/Installation/CHANGES
@@ -35,6 +35,11 @@ since CGAL-3.6:
 
   - Fix compilation errors with recent Boost versions (since 1.40).
 
+  - Initial support for the Microsoft Visual C++ compiler 10.0 (VC10). For
+    that support, CMake>=2.8.2 is required. At the time CGAL-3.6.1 was
+    released, CMake-2.8.2 was not yet released, but CMake-2.8.2rc1 was
+    published by Kitware at http://www.cmake.org/files/v2.8/
+
 
 2. Polynomial
 
diff --git a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
index 4274c5b7ba3..0be751a53c5 100644
--- a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
+++ b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
@@ -8,11 +8,19 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED )
     set(CGAL_AUTO_LINK_ENABLED TRUE)
 
     if(NOT CGAL_CONFIG_LOADED)
-      set(CGAL_AUTO_LINK_GMP TRUE 
-        CACHE BOOL "Enable/Disable auto-linking for the external library GMP")
+      if(MSVC10)
+        set(CGAL_AUTO_LINK_GMP FALSE
+          CACHE BOOL "Enable/Disable auto-linking for the external library GMP")
 
-      set(CGAL_AUTO_LINK_MPFR TRUE
-        CACHE BOOL "Enable/Disable auto-linking for the external library MPFR")
+        set(CGAL_AUTO_LINK_MPFR FALSE
+          CACHE BOOL "Enable/Disable auto-linking for the external library MPFR")
+      else(MSVC10)
+        set(CGAL_AUTO_LINK_GMP TRUE
+          CACHE BOOL "Enable/Disable auto-linking for the external library GMP")
+
+        set(CGAL_AUTO_LINK_MPFR TRUE
+          CACHE BOOL "Enable/Disable auto-linking for the external library MPFR")
+      endif(MSVC10)
     endif()
   endif()