diff --git a/mingw-w64-cmake-git/0001-Windows-Add-missing-stringapiset.h-include.patch b/mingw-w64-cmake-git/0001-Windows-Add-missing-stringapiset.h-include.patch
index 20a39ef9b6..020dfaa52e 100644
--- a/mingw-w64-cmake-git/0001-Windows-Add-missing-stringapiset.h-include.patch
+++ b/mingw-w64-cmake-git/0001-Windows-Add-missing-stringapiset.h-include.patch
@@ -1,7 +1,7 @@
-From fbdba9f9df874535c0caa85418989f12c290f9cb Mon Sep 17 00:00:00 2001
+From 99627b34ca6ba0fcbf302509e5a17346407f8bfb Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 23 Jan 2017 12:46:49 +0000
-Subject: [PATCH 1/5] Windows: Add missing stringapiset.h include
+Subject: [PATCH 1/8] Windows: Add missing stringapiset.h include
 
 This is needed for WideCharToMultiByte()
 ---
diff --git a/mingw-w64-cmake-git/0002-bootstrap-Set-DEFAULT_CODEPAGE-in-cmake_cxx_flags_En.patch b/mingw-w64-cmake-git/0002-bootstrap-Set-DEFAULT_CODEPAGE-in-cmake_cxx_flags_En.patch
index d7bec2057f..2134edb2b3 100644
--- a/mingw-w64-cmake-git/0002-bootstrap-Set-DEFAULT_CODEPAGE-in-cmake_cxx_flags_En.patch
+++ b/mingw-w64-cmake-git/0002-bootstrap-Set-DEFAULT_CODEPAGE-in-cmake_cxx_flags_En.patch
@@ -1,7 +1,7 @@
-From cf8b4c3d8bffca97cff3bf15ddf510f6777652d8 Mon Sep 17 00:00:00 2001
+From 40605b317f9b5e577fef9abf4c4e3d79a15a7808 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 23 Jan 2017 13:55:30 +0000
-Subject: [PATCH 2/5] bootstrap: Set DEFAULT_CODEPAGE in
+Subject: [PATCH 2/8] bootstrap: Set DEFAULT_CODEPAGE in
  cmake_cxx_flags_EncodingCXX
 
 ---
diff --git a/mingw-w64-cmake-git/0003-Disable-response-files-for-MSYS-Generator.patch b/mingw-w64-cmake-git/0003-Disable-response-files-for-MSYS-Generator.patch
index 823d044106..73ef4f876c 100644
--- a/mingw-w64-cmake-git/0003-Disable-response-files-for-MSYS-Generator.patch
+++ b/mingw-w64-cmake-git/0003-Disable-response-files-for-MSYS-Generator.patch
@@ -1,7 +1,7 @@
-From 6d42574216806218436bd2a37817bb2829840d8b Mon Sep 17 00:00:00 2001
+From 653a089289fe2f45c9d366adf05e90b100c25a47 Mon Sep 17 00:00:00 2001
 From: Alexpux <alexey.pawlow@gmail.com>
 Date: Mon, 3 Aug 2015 22:00:16 +0100
-Subject: [PATCH 3/5] Disable response files for MSYS Generator
+Subject: [PATCH 3/8] Disable response files for MSYS Generator
 
 ---
  Modules/Platform/Windows-GNU.cmake | 8 +++++---
diff --git a/mingw-w64-cmake-git/0004-Implement-Qt5-static-plugin-support.patch b/mingw-w64-cmake-git/0004-Implement-Qt5-static-plugin-support.patch
index 43742a8620..e162f4ebc0 100644
--- a/mingw-w64-cmake-git/0004-Implement-Qt5-static-plugin-support.patch
+++ b/mingw-w64-cmake-git/0004-Implement-Qt5-static-plugin-support.patch
@@ -1,7 +1,7 @@
-From 4b46d703b48093bdea4504c9de642639ad027bd3 Mon Sep 17 00:00:00 2001
+From 239703a5bcaf5df957f56fe21c610f50288af396 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 3 Aug 2015 22:00:16 +0100
-Subject: [PATCH 4/5] Implement Qt5 static plugin support
+Subject: [PATCH 4/8] Implement Qt5 static plugin support
 
 Enabled via a new target property "AUTOSTATICPLUGINS".
 
diff --git a/mingw-w64-cmake-git/0005-Do-not-install-Qt-bundle-in-cmake-gui.patch b/mingw-w64-cmake-git/0005-Do-not-install-Qt-bundle-in-cmake-gui.patch
new file mode 100644
index 0000000000..a0b1f38747
--- /dev/null
+++ b/mingw-w64-cmake-git/0005-Do-not-install-Qt-bundle-in-cmake-gui.patch
@@ -0,0 +1,25 @@
+From 82e500ab54ae41d88f3cb98b326637708ad80ca9 Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Tue, 14 Feb 2017 09:30:36 -0600
+Subject: [PATCH 5/8] Do not install Qt bundle in cmake-gui
+
+---
+ Source/QtDialog/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
+index 10fd718baf..3c2a6ddbea 100644
+--- a/Source/QtDialog/CMakeLists.txt
++++ b/Source/QtDialog/CMakeLists.txt
+@@ -213,7 +213,7 @@ if(APPLE)
+   " ${COMPONENT})
+ endif()
+ 
+-if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
++if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32) AND NOT MINGW)
+   # install rules for including 3rd party libs such as Qt
+   # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
+   set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
+-- 
+2.11.0
+
diff --git a/mingw-w64-cmake-git/0006-pkg-config-Add-dont-define-prefix-when-PKG_CONFIG_WI.patch b/mingw-w64-cmake-git/0006-pkg-config-Add-dont-define-prefix-when-PKG_CONFIG_WI.patch
new file mode 100644
index 0000000000..68259a3bd0
--- /dev/null
+++ b/mingw-w64-cmake-git/0006-pkg-config-Add-dont-define-prefix-when-PKG_CONFIG_WI.patch
@@ -0,0 +1,32 @@
+From 9e5de9d1f1d28cade629e602b7c236eebdeea97d Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Tue, 14 Feb 2017 09:34:39 -0600
+Subject: [PATCH 6/8] pkg-config: Add --dont-define-prefix when
+ PKG_CONFIG_WITHOUT_PREFIX
+
+---
+ Modules/FindPkgConfig.cmake | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 1958f4b434..c590bfa6e5 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -55,8 +55,13 @@ endmacro()
+ macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
+   set(_pkgconfig_invoke_result)
+ 
++  if (PKG_CONFIG_WITHOUT_PREFIX)
++    set(_pkgconfig_extra_arg "--dont-define-prefix")
++  else()
++    set(_pkgconfig_extra_arg "")
++  endif()
+   execute_process(
+-    COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist}
++    COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkgconfig_extra_arg} ${ARGN} ${_pkglist}
+     OUTPUT_VARIABLE _pkgconfig_invoke_result
+     RESULT_VARIABLE _pkgconfig_failed
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+-- 
+2.11.0
+
diff --git a/mingw-w64-cmake-git/0007-Do-not-generate-import-libs-for-exes.patch b/mingw-w64-cmake-git/0007-Do-not-generate-import-libs-for-exes.patch
new file mode 100644
index 0000000000..49563a87a5
--- /dev/null
+++ b/mingw-w64-cmake-git/0007-Do-not-generate-import-libs-for-exes.patch
@@ -0,0 +1,25 @@
+From bdc8c18fac7657abadcfa5df230f86c25494fa92 Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Tue, 14 Feb 2017 09:35:40 -0600
+Subject: [PATCH 7/8] Do not generate import libs for exes
+
+---
+ Modules/Platform/Windows-GNU.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
+index ed5166a519..9dea1649aa 100644
+--- a/Modules/Platform/Windows-GNU.cmake
++++ b/Modules/Platform/Windows-GNU.cmake
+@@ -107,7 +107,7 @@ macro(__windows_compiler_gnu lang)
+   set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
+     "<CMAKE_${lang}_COMPILER> <CMAKE_SHARED_LIBRARY_${lang}_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES>")
+   set(CMAKE_${lang}_LINK_EXECUTABLE
+-    "<CMAKE_${lang}_COMPILER> <FLAGS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <LINK_LIBRARIES>")
++    "<CMAKE_${lang}_COMPILER> <FLAGS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> ${CMAKE_GNULD_IMAGE_VERSION} <LINK_LIBRARIES>")
+ 
+   list(APPEND CMAKE_${lang}_ABI_FILES "Platform/Windows-GNU-${lang}-ABI")
+ 
+-- 
+2.11.0
+
diff --git a/mingw-w64-cmake-git/0005-Output-line-numbers-in-callstacks.patch b/mingw-w64-cmake-git/0008-Output-line-numbers-in-callstacks.patch
similarity index 89%
rename from mingw-w64-cmake-git/0005-Output-line-numbers-in-callstacks.patch
rename to mingw-w64-cmake-git/0008-Output-line-numbers-in-callstacks.patch
index ef6db9de1f..fc69274572 100644
--- a/mingw-w64-cmake-git/0005-Output-line-numbers-in-callstacks.patch
+++ b/mingw-w64-cmake-git/0008-Output-line-numbers-in-callstacks.patch
@@ -1,7 +1,7 @@
-From 2af83007562993b5197faaa5aa0f3adf2cec7212 Mon Sep 17 00:00:00 2001
+From aa31c0e3a6710ba86abc1edbb19e88d4c630323b Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 3 Aug 2015 22:00:17 +0100
-Subject: [PATCH 5/5] Output line numbers in callstacks
+Subject: [PATCH 8/8] Output line numbers in callstacks
 
 Now just a marker for where to add the new code.
 ---