diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake
index 8e13516e51..09df407b10 100644
--- a/ports/wxwidgets/portfile.cmake
+++ b/ports/wxwidgets/portfile.cmake
@@ -66,13 +66,15 @@ endif()
 # do the copy pdbs now after the dlls got moved to the expected /bin folder above
 vcpkg_copy_pdbs()
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/mswud)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/mswud ${CURRENT_PACKAGES_DIR}/lib/mswud)
-endif()
-
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/msvc)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(GLOB_RECURSE INCLUDES ${CURRENT_PACKAGES_DIR}/include/*)
+file(GLOB_RECURSE INCLUDES ${CURRENT_PACKAGES_DIR}/include/*.h)
+if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h)
+    list(APPEND INCLUDES ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h)
+endif()
+if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h)
+    list(APPEND INCLUDES ${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h)
+endif()
 foreach(INC IN LISTS INCLUDES)
     file(READ "${INC}" _contents)
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -85,6 +87,9 @@ foreach(INC IN LISTS INCLUDES)
     file(WRITE "${INC}" "${_contents}")
 endforeach()
 
+if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/wx/setup.h)
+    file(COPY ${CMAKE_CURRENT_LIST_DIR}/setup.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/wx)
+endif()
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxwidgets)
 configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/wxwidgets/usage COPYONLY)
 file(INSTALL ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/wxwidgets/setup.h b/ports/wxwidgets/setup.h
new file mode 100644
index 0000000000..d05b4c5ed0
--- /dev/null
+++ b/ports/wxwidgets/setup.h
@@ -0,0 +1,5 @@
+#ifdef _DEBUG
+#include "../../debug/lib/mswud/wx/setup.h"
+#else
+#include "../../lib/mswu/wx/setup.h"
+#endif
diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json
index 49b2fab101..dea70c5452 100644
--- a/ports/wxwidgets/vcpkg.json
+++ b/ports/wxwidgets/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wxwidgets",
   "version-semver": "3.1.4",
-  "port-version": 5,
+  "port-version": 6,
   "description": "a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.",
   "homepage": "https://github.com/wxWidgets/wxWidgets",
   "supports": "!uwp",
diff --git a/versions/baseline.json b/versions/baseline.json
index 7a426045d7..68ac735c53 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6230,7 +6230,7 @@
     },
     "wxwidgets": {
       "baseline": "3.1.4",
-      "port-version": 5
+      "port-version": 6
     },
     "x-plane": {
       "baseline": "3.0.3",
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
index 2d87681d0b..43ffec5ca4 100644
--- a/versions/w-/wxwidgets.json
+++ b/versions/w-/wxwidgets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eed8ba1dc939b1c1a17a05bf409142664015ad4d",
+      "version-semver": "3.1.4",
+      "port-version": 6
+    },
     {
       "git-tree": "c608ed7a8383b93a30bd7894b8bee51b0c53066d",
       "version-semver": "3.1.4",