diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass
index 243a406..a792159 100644
--- a/classes/populate_sdk_qt6_base.bbclass
+++ b/classes/populate_sdk_qt6_base.bbclass
@@ -40,6 +40,7 @@ create_qt6_sdk_files () {
     # add qt.conf to both bin and libexec dirs
     cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/
     cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_HOST_LIBEXECDIR}/
+    cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/target_qt.conf
 
     install -d ${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d
     script=${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/qt6.sh
diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb
index ae93426..f6e7172 100644
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@@ -153,6 +153,11 @@ do_install:append:class-nativesdk() {
 set(QT_HOST_PATH "\$ENV{OECORE_NATIVE_SYSROOT}/usr" CACHE PATH "")
 set(QT_BUILD_TOOLS_WHEN_CROSSCOMPILING "TRUE" CACHE BOOL "")
 EOF
+
+    sed -i ${D}${QT6_INSTALL_BINDIR}/* \
+        -e 's|${RECIPE_SYSROOT_NATIVE}|${SDKPATHNATIVE}|' \
+        -e '/^toolchain_path=/s|.*|toolchain_path=${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake|'
+
 }
 
 INSANE_SKIP:${PN}-ptest += "arch"