diff --git a/buildconfig/CMake/Bootstrap.cmake b/buildconfig/CMake/Bootstrap.cmake
index d927789189a04c9ed68379f9a25e0b25789bd047..1432c9ad11ecaca20beb62f2776025bb399ca992 100644
--- a/buildconfig/CMake/Bootstrap.cmake
+++ b/buildconfig/CMake/Bootstrap.cmake
@@ -10,7 +10,7 @@ if( MSVC )
   include ( ExternalProject )
   set( EXTERNAL_ROOT ${PROJECT_SOURCE_DIR}/external CACHE PATH "Location to clone third party dependencies to" )
   set( THIRD_PARTY_GIT_URL "https://github.com/mantidproject/thirdparty-msvc2015.git" )
-  set ( THIRD_PARTY_GIT_SHA1 ef72b6d824ff2df21cca80c87b565136cc4020aa )
+  set ( THIRD_PARTY_GIT_SHA1 3b4620fd3ab80d48182861f5a5cba1bc96ab17e4 )
   set ( THIRD_PARTY_DIR ${EXTERNAL_ROOT}/src/ThirdParty )
   # Generates a script to do the clone/update in tmp
   set ( _project_name ThirdParty )
@@ -67,7 +67,7 @@ if( MSVC )
   # Print out where we are looking for 3rd party stuff
   set ( PYTHON_MAJOR_VERSION 2 )
   set ( PYTHON_MINOR_VERSION 7 )
-  set ( THIRD_PARTY_BIN "${THIRD_PARTY_DIR}/bin;${THIRD_PARTY_DIR}/lib/qt4/bin;${THIRD_PARTY_DIR}/lib/python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}" )
+  set ( THIRD_PARTY_BIN "${THIRD_PARTY_DIR}/bin;${THIRD_PARTY_DIR}/lib/qt4/bin;${THIRD_PARTY_DIR}/lib/qt5/bin;${THIRD_PARTY_DIR}/lib/python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}" )
   message ( STATUS "Third party dependencies are in ${THIRD_PARTY_DIR}" )
   # Add to the path so that cmake can configure correctly without the user having to do it
   set ( ENV{PATH} "${THIRD_PARTY_BIN};$ENV{PATH}" )
diff --git a/buildconfig/CMake/MSVCSetup.cmake b/buildconfig/CMake/MSVCSetup.cmake
index fb794d069365d3ec110e96a0c8e9522e89901667..5c233b472e2d1aaadbe4dfcffc2216302fb61fc1 100644
--- a/buildconfig/CMake/MSVCSetup.cmake
+++ b/buildconfig/CMake/MSVCSetup.cmake
@@ -40,6 +40,11 @@ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Zm${VISUALSTUDIO_COMPILERHEAPLIMIT}" )
 set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm${VISUALSTUDIO_COMPILERHEAPLIMIT}" )
 endif()
 
+###########################################################################
+# Qt5 is always in the same place
+###########################################################################
+set ( Qt5_DIR ${THIRD_PARTY_DIR}/lib/qt5/lib/cmake/Qt5 )
+
 ###########################################################################
 # On Windows we want to bundle Python.
 ###########################################################################
diff --git a/buildconfig/CMake/QScintillaFindImpl.cmake b/buildconfig/CMake/QScintillaFindImpl.cmake
index f8f4e3d1d2cbc0d5d8c76fa4d72d9ca3667410e7..e56a60132e597d899b6e247435544bc991824395 100644
--- a/buildconfig/CMake/QScintillaFindImpl.cmake
+++ b/buildconfig/CMake/QScintillaFindImpl.cmake
@@ -36,6 +36,11 @@ function (find_qscintilla qt_version)
       qt5scintilla2
       libqscintilla2-qt5.dylib
     )
+    if ( MSVC )
+      set ( _qsci_lib_paths
+        ${THIRD_PARTY_DIR}/lib/qt5/lib
+      )
+    endif()
     set ( _qsci_include_paths
       ${Qt5Core_INCLUDE_DIRS}
     )