diff --git a/ports/qtbase/installed_dir.patch b/ports/qtbase/installed_dir.patch
new file mode 100644
index 00000000000..91867314159
--- /dev/null
+++ b/ports/qtbase/installed_dir.patch
@@ -0,0 +1,15 @@
+diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in
+index 6e37ae02..e7e84468 100644
+--- a/cmake/qt.toolchain.cmake.in
++++ b/cmake/qt.toolchain.cmake.in
+@@ -65,6 +65,10 @@ get_filename_component(QT_TOOLCHAIN_RELOCATABLE_INSTALL_PREFIX
+ # one level higher is what we're looking for.
+ get_filename_component(QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
+ 
++get_filename_component(vcpkg_installed_dir
++                       ${CMAKE_CURRENT_LIST_DIR}/../../../
++                       ABSOLUTE)
++
+ # REROOT_PATH_ISSUE_MARKER
+ # There's a subdirectory check in cmake's cmFindCommon::RerootPaths() function, that doesn't handle
+ # the case of CMAKE_PREFIX_PATH == CMAKE_FIND_ROOT_PATH for a particular pair of entries.
diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
index 2b812f45d87..fefa73ae770 100644
--- a/ports/qtbase/portfile.cmake
+++ b/ports/qtbase/portfile.cmake
@@ -16,6 +16,7 @@ set(${PORT}_PATCHES
         harfbuzz.patch
         fix_egl.patch
         clang-cl_QGADGET_fix.diff # Upstream is still figuring out if this is a compiler bug or not.
+        installed_dir.patch
         )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
@@ -340,6 +341,7 @@ string(REGEX REPLACE "set\\\(__qt_chainload_toolchain_file [^\\\n]+\\\n" "set(__
 string(REGEX REPLACE "set\\\(VCPKG_CHAINLOAD_TOOLCHAIN_FILE [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}")
 string(REGEX REPLACE "set\\\(__qt_initial_c_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}")
 string(REGEX REPLACE "set\\\(__qt_initial_cxx_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}")
+string(REPLACE "${CURRENT_HOST_INSTALLED_DIR}" "\${vcpkg_installed_dir}/${HOST_TRIPLET}" toolchain_contents "${toolchain_contents}")
 file(WRITE "${qttoolchain}" "${toolchain_contents}")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS)
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index d3b0abddaee..44bae6f5bbe 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qtbase",
   "version": "6.3.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index 0364e3d6c7a..e0f75473ed5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5954,7 +5954,7 @@
     },
     "qtbase": {
       "baseline": "6.3.1",
-      "port-version": 1
+      "port-version": 2
     },
     "qtcharts": {
       "baseline": "6.3.1",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index e847c3a605d..c75a137235b 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3fa8531e9f444076cc6e73b979bcaaa3e665a7a5",
+      "version": "6.3.1",
+      "port-version": 2
+    },
     {
       "git-tree": "53f9f138ffa51742c27c5e44606f86b6b70b2734",
       "version": "6.3.1",