diff --git a/CMake/FindMySQL.cmake b/CMake/FindMySQL.cmake
index 8cd16709..f01e421d 100644
--- a/CMake/FindMySQL.cmake
+++ b/CMake/FindMySQL.cmake
@@ -1,6 +1,6 @@
 # - Find MySQL
 # This module finds MySQL libraries.
-# 
+#
 #
 # MYSQL_INCLUDE_DIR - Directories to include to use MySQL
 # MYSQL_LIBRARIES   - Files to link against to use MySQL
@@ -14,21 +14,21 @@ find_path( MYSQL_INCLUDE_DIR NAMES mysql.h
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/"
   "C:/Program Files/MySQL/include"
-  "C:/Program Files/MySQL/MySQL Server 5.1/include"
-  PATH_SUFFIXES "include" "include/mysql" "mysql/include" 
+  "C:/Program Files/MySQL/MySQL Server 5.*/include"
+  PATH_SUFFIXES "include" "include/mysql" "mysql/include"
   DOC "Specify the directory containing mysql.h"
 )
 
 set( MYSQL_LIBRARY_NAMES mysql libmysql mysqlclient mysqlclient_r )
 
-find_library( MYSQL_LIBRARIES 
+find_library( MYSQL_LIBRARIES
   NAMES ${MYSQL_LIBRARY_NAMES}
   PATHS
   "$ENV{ProgramFiles}/MySQL/*/"
   "$ENV{SystemDrive}/MySQL/*/"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/lib/opt"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/lib/opt"
-  "C:/Program Files/MySQL/MySQL Server 5.1/lib/opt"
+  "C:/Program Files/MySQL/MySQL Server 5.*/lib/opt"
   PATH_SUFFIXES "lib" "mysql" "mysql/lib" "mysql/lib/mysql" "lib/opt"
   DOC "Specify the mysql library here."
 )
@@ -38,32 +38,32 @@ find_library( MYSQL_LIBRARIES
 if( NOT WIN32 )
   find_package( ZLIB )
   set( MYSQL_EXTRA_LIBRARIES ${ZLIB_LIBRARY} )
-  
+
   include( FindPackageHandleStandardArgs )
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS( MYSQL DEFAULT_MSG 
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS( MYSQL DEFAULT_MSG
     MYSQL_INCLUDE_DIR
     MYSQL_LIBRARIES
     MYSQL_EXTRA_LIBRARIES
   )
 
-  mark_as_advanced( MYSQL_FOUND 
-    MYSQL_LIBRARIES 
-    MYSQL_EXTRA_LIBRARIES 
-    MYSQL_INCLUDE_DIR 
+  mark_as_advanced( MYSQL_FOUND
+    MYSQL_LIBRARIES
+    MYSQL_EXTRA_LIBRARIES
+    MYSQL_INCLUDE_DIR
   )
 
 else( NOT WIN32 )
   set( MYSQL_EXTRA_LIBRARIES "" )
-  
+
   include( FindPackageHandleStandardArgs )
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS( MYSQL DEFAULT_MSG 
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS( MYSQL DEFAULT_MSG
     MYSQL_INCLUDE_DIR
     MYSQL_LIBRARIES
   )
 
-  mark_as_advanced( MYSQL_FOUND 
-    MYSQL_LIBRARIES 
-    MYSQL_INCLUDE_DIR 
+  mark_as_advanced( MYSQL_FOUND
+    MYSQL_LIBRARIES
+    MYSQL_INCLUDE_DIR
   )
 endif( NOT WIN32 )
 
diff --git a/CMake/SuperBuild/External-Boost.cmake b/CMake/SuperBuild/External-Boost.cmake
index 303e8e8a..9d4caaea 100644
--- a/CMake/SuperBuild/External-Boost.cmake
+++ b/CMake/SuperBuild/External-Boost.cmake
@@ -1,45 +1,58 @@
 #---------------------------------------------------------------------------
 # Get and build boost
 
-set( Boost_Bootstrap_Command )
-if( UNIX )
+if( WIN32 )
+  ExternalProject_Add( Boost
+    GIT_REPOSITORY "${git_protocol}://github.com/pocb/boost.git"
+    GIT_TAG "origin/cmake-1.46.1"
+    SOURCE_DIR ${proj}
+    BINARY_DIR ${proj}-build
+    CMAKE_GENERATOR ${gen}
+    CMAKE_ARGS
+      ${ep_common_args}
+      -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/INSTALL
+      -DBUILD_PROJECTS:STRING=program_options
+      -DWITH_PYTHON:BOOL=OFF
+      -DWITH_DOXYGEN:BOOL=OFF
+      -DWITH_EXPAT:BOOL=OFF
+      -DWITH_BZIP2:BOOL=OFF
+      -DWITH_MPI:BOOL=OFF
+      -DWITH_XSLTPROC:BOOL=OFF
+      -DWITH_ICU:BOOL=OFF
+    #INSTALL_COMMAND ""
+  )
+
+  set( Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/ )
+  set( BOOST_LIBRARYDIR  ${CMAKE_BINARY_DIR}/INSTALL/lib/ )
+  set( Boost_INCLUDE_DIR ${CMAKE_BINARY_DIR}/INSTALL/include/ )
+else()
   set( Boost_Bootstrap_Command ./bootstrap.sh )
   set( Boost_b2_Command ./b2 )
-else()
-  if( WIN32 )
-    set( Boost_Bootstrap_Command bootstrap.bat )
-    set( Boost_b2_Command b2.exe )
-  endif()
-endif()
 
-set( Boost_Patches_DIR ${Patches_DIR}/boost )
-set( Boost_Patch_Script ${Boost_Patches_DIR}/boost_patch.sh )
-set( Boost_Patch_Command sh ${Boost_Patch_Script} )
+  set( Boost_Patches_DIR ${Patches_DIR}/boost )
+  set( Boost_Patch_Script ${Boost_Patches_DIR}/boost_patch.sh )
+  set( Boost_Patch_Command sh ${Boost_Patch_Script} )
 
-ExternalProject_Add(Boost
-  URL "http://sourceforge.net/projects/boost/files/boost/1.54.0/boost_1_54_0.tar.gz"
-  URL_MD5 efbfbff5a85a9330951f243d0a46e4b9
-  BUILD_IN_SOURCE 1
-  UPDATE_COMMAND ""
-  PATCH_COMMAND ${Boost_Patch_Command}
-  CONFIGURE_COMMAND ${Boost_Bootstrap_Command} --without-icu --prefix=${CMAKE_BINARY_DIR}/INSTALL
-  BUILD_COMMAND ${Boost_b2_Command}
-    --without-python
-    --without-mpi
-    link=static
-    link=shared
-    threading=multi
-    -d+2
-    -j${NProcessors}
-    install
-  INSTALL_COMMAND ""
-  INSTALL_DIR ${CMAKE_BINARY_DIR}/INSTALL
-)
+  ExternalProject_Add(Boost
+    URL "http://sourceforge.net/projects/boost/files/boost/1.54.0/boost_1_54_0.tar.gz"
+    URL_MD5 efbfbff5a85a9330951f243d0a46e4b9
+    BUILD_IN_SOURCE 1
+    UPDATE_COMMAND ""
+    PATCH_COMMAND ${Boost_Patch_Command}
+    CONFIGURE_COMMAND ${Boost_Bootstrap_Command} --without-icu --prefix=${CMAKE_BINARY_DIR}/INSTALL
+    BUILD_COMMAND ${Boost_b2_Command}
+      --without-python
+      --without-mpi
+      link=static
+      link=shared
+      threading=multi
+      -d+2
+      -j${NProcessors}
+      install
+    INSTALL_COMMAND ""
+    INSTALL_DIR ${CMAKE_BINARY_DIR}/INSTALL
+  )
 
-if( NOT WIN32 )
-  set(Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/boost/ )
-  set(Boost_INCLUDE_DIR ${CMAKE_BINARY_DIR}/INSTALL/include/ )
-else()
-  set(Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/ )
-  set(Boost_INCLUDE_DIR ${CMAKE_BINARY_DIR}/INSTALL/include/boost-1_54/ )
+  set( Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/ )
+  set( Boost_INCLUDE_DIR ${CMAKE_BINARY_DIR}/INSTALL/include/boost-1_54/ )
 endif()
diff --git a/CMake/SuperBuild/SuperBuild.cmake b/CMake/SuperBuild/SuperBuild.cmake
index 429bf70a..d2206934 100644
--- a/CMake/SuperBuild/SuperBuild.cmake
+++ b/CMake/SuperBuild/SuperBuild.cmake
@@ -68,7 +68,7 @@ set(GoFigure2_DEPENDENCIES)
 
 #-------------------------
 
-find_package( Boost 1.39 REQUIRED )
+find_package( Boost 1.46 )
 
 if( Boost_FOUND )
   set( SUPER_BOOST OFF )