diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc
index 11cfcff03a..392508fa6f 100644
--- a/recipes-qt/qt5/qt5-native.inc
+++ b/recipes-qt/qt5/qt5-native.inc
@@ -10,7 +10,7 @@ inherit native
 
 QT_MODULE = "qtbase"
 
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/qtbase:"
 
 SRC_URI += " \
   file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \
diff --git a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch b/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch
similarity index 100%
rename from recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
rename to recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch
diff --git a/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
similarity index 100%
rename from recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
rename to recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
diff --git a/recipes-qt/qt5/files/qmake.conf.sh b/recipes-qt/qt5/qtbase/qmake.conf.sh
similarity index 100%
rename from recipes-qt/qt5/files/qmake.conf.sh
rename to recipes-qt/qt5/qtbase/qmake.conf.sh
diff --git a/recipes-qt/qt5/files/qplatformdefs.h b/recipes-qt/qt5/qtbase/qplatformdefs.h
similarity index 100%
rename from recipes-qt/qt5/files/qplatformdefs.h
rename to recipes-qt/qt5/qtbase/qplatformdefs.h