diff --git a/Modules/CMakeVS6FindMake.cmake b/Modules/CMakeVS6FindMake.cmake
index f73e2724c..e0719cdee 100644
--- a/Modules/CMakeVS6FindMake.cmake
+++ b/Modules/CMakeVS6FindMake.cmake
@@ -7,3 +7,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
   "/Program Files/Microsoft Visual Studio/Common/MSDev98/Bin"
   )
 MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
+SET(MSVC60 1)
diff --git a/Modules/CMakeVS71FindMake.cmake b/Modules/CMakeVS71FindMake.cmake
index ef21887be..666c83dc1 100644
--- a/Modules/CMakeVS71FindMake.cmake
+++ b/Modules/CMakeVS71FindMake.cmake
@@ -8,3 +8,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
   "/Program Files/Microsoft Visual Studio .NET/Common7/IDE/"
   )
 MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
+SET(MSVC71 1)
diff --git a/Modules/CMakeVS7FindMake.cmake b/Modules/CMakeVS7FindMake.cmake
index a9ef85ef1..2d12267ae 100644
--- a/Modules/CMakeVS7FindMake.cmake
+++ b/Modules/CMakeVS7FindMake.cmake
@@ -7,3 +7,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
   "/Program Files/Microsoft Visual Studio .NET/Common7/IDE/"
   )
 MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
+SET(MSVC70 1)
diff --git a/Modules/CMakeVS8FindMake.cmake b/Modules/CMakeVS8FindMake.cmake
index 79e464b89..79aa5a83e 100644
--- a/Modules/CMakeVS8FindMake.cmake
+++ b/Modules/CMakeVS8FindMake.cmake
@@ -12,3 +12,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
   "/Program Files/Microsoft Visual Studio 8/Common7/IDE/"
   )
 MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
+SET(MSVC80 1)
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 404058d82..8d431bfcd 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -3,22 +3,7 @@
 # not complete because it is used only for the release process by the
 # developers.
 IF(MSVC)
-  STRING(REGEX REPLACE "\\\\" "/" SYSTEMROOT "$ENV{SYSTEMROOT}")
-  IF(CMAKE_GENERATOR STREQUAL "Visual Studio 7")
-    SET(MSVC70 1)
-    SET(MSVC71)
-    SET(MSVC80)
-  ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 7")
-  IF(CMAKE_GENERATOR STREQUAL "Visual Studio 7 .NET 2003")
-    SET(MSVC70)
-    SET(MSVC71 1)
-    SET(MSVC80)
-  ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 7 .NET 2003")
-  IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005")
-    SET(MSVC70)
-    SET(MSVC71)
-    SET(MSVC80 1)
-  ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005")
+  FILE(TO_CMAKE_PATH "$ENV{SYSTEMROOT}" SYSTEMROOT)
   IF(MSVC70)
     SET(__install__libs
       "${SYSTEMROOT}/system32/msvcp70.dll"
@@ -39,17 +24,17 @@ IF(MSVC)
   ENDIF(MSVC80)
   IF(CMAKE_INSTALL_MFC_LIBRARIES)
     IF(MSVC70)
-      SET(__install__libs
+      SET(__install__libs ${__install__libs}
         "${SYSTEMROOT}/system32/mfc70.dll"
         )
     ENDIF(MSVC70)
     IF(MSVC71)
-      SET(__install__libs
+      SET(__install__libs ${__install__libs}
         "${SYSTEMROOT}/system32/mfc71.dll"
         )
     ENDIF(MSVC71)
     IF(MSVC80)
-      SET(__install__libs
+      SET(__install__libs ${__install__libs}
         "${SYSTEMROOT}/system32/mfc80.dll"
         )
     ENDIF(MSVC80)