$ gcc -v 2>&1 |egrep '(Target|version)'
Target: x86_64-w64-mingw32
gcc version 4.6.2 20110802 (prerelease) (GCC)

diff --git a/bootstrap b/bootstrap
index f5eacbd..c67c28e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -127,10 +127,20 @@ fi
 cmake_bootstrap_dir="${cmake_binary_dir}/Bootstrap${_cmk}"
 
 # Helper function to fix windows paths.
-cmake_fix_slashes ()
-{
-  echo "$1" | sed 's/\\/\//g'
-}
+case "${cmake_system}" in
+*MINGW*)
+  cmake_fix_slashes()
+  {
+    cmd //c echo "$(echo "$1" | sed 's/\\/\//g')" | sed 's/^"//;s/"$//'

+  }
+  ;;
+*)
+  cmake_fix_slashes()
+  {
+    echo "$1" | sed 's/\\/\//g'
+  }
+  ;;
+esac
 
 # Choose the default install prefix.
 if ${cmake_system_mingw}; then

diff --git a/Tests/CTestUpdateHG.cmake.in b/Tests/CTestUpdateHG.cmake.in
index 543ddd9..5a9daae 100644
--- a/Tests/CTestUpdateHG.cmake.in
+++ b/Tests/CTestUpdateHG.cmake.in
@@ -28,7 +28,7 @@ run_child(
   WORKING_DIRECTORY ${TOP}/repo.hg
   COMMAND ${HG} init
   )
-set(REPO file://${TOP}/repo.hg [^])
+set(REPO file:///${TOP}/repo.hg [^])

 #-----------------------------------------------------------------------------
 # Import initial content into the repository.

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 29ce25d6..caa44f1 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -126,9 +126,9 @@ IF(CURL_MALLOC_DEBUG)
 ENDIF(CURL_MALLOC_DEBUG)

 # On windows preload settings
-IF(WIN32)
+IF(WIN32 AND NOT MINGW)
   INCLUDE(${LIBCURL_SOURCE_DIR}/Platforms/WindowsCache.cmake)
-ENDIF(WIN32)
+ENDIF()

 # This macro checks if the symbol exists in the library and if it
 # does, it appends library to the list.

diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageTest/CMakeLists.txt
index 9a4bdfe..0157b19 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -158,7 +158,9 @@ UNSET(CMAKE_LIBRARY_ARCHITECTURE)
 SET(CMAKE_PREFIX_PATH)
 SET(ENV{EnvA_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/lib/zot-3.1")
 FIND_PACKAGE(EnvA 3.1 EXACT QUIET NAMES zot) # Should Work
+SET(CMAKE_FIND_DEBUG_MODE 1)
 FIND_PACKAGE(EnvB 3.1 EXACT QUIET NAMES zot) # Should Fail
+SET(CMAKE_FIND_DEBUG_MODE 0)

 # Test system package registry if available.
 IF(CMakeTestSystemPackage)