diff --git a/mingw-w64-pyside2-qt5/PKGBUILD b/mingw-w64-pyside2-qt5/PKGBUILD
index 77cb67368a..01c5f40aea 100644
--- a/mingw-w64-pyside2-qt5/PKGBUILD
+++ b/mingw-w64-pyside2-qt5/PKGBUILD
@@ -6,18 +6,56 @@ pkgbase=mingw-w64-${_realname}-qt5
 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-qt5)
 pkgdesc="Provides LGPL Qt5 bindings for Python and related tools for binding generation (mingw-w64)"
 pkgver=5.15.2
-pkgrel=6
+pkgrel=7
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
 url="https://doc.qt.io/qtforpython-5/"
 license=("LGPL")
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-shiboken2-qt5"
-         "${MINGW_PACKAGE_PREFIX}-qt5")
+         "${MINGW_PACKAGE_PREFIX}-qt5-declarative")
+optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-winextras"
+            "${MINGW_PACKAGE_PREFIX}-qt5-xmlpatterns"
+            "${MINGW_PACKAGE_PREFIX}-qt5-tools"
+            "${MINGW_PACKAGE_PREFIX}-qt5-multimedia"
+            "${MINGW_PACKAGE_PREFIX}-qt5-location"
+            "${MINGW_PACKAGE_PREFIX}-qt5-quickcontrols2"
+            "${MINGW_PACKAGE_PREFIX}-qt5-remoteobjects"
+            "${MINGW_PACKAGE_PREFIX}-qt5-scxml"
+            "${MINGW_PACKAGE_PREFIX}-qt5-script"
+            "${MINGW_PACKAGE_PREFIX}-qt5-sensors"
+            "${MINGW_PACKAGE_PREFIX}-qt5-serialport"
+            "${MINGW_PACKAGE_PREFIX}-qt5-speech"
+            "${MINGW_PACKAGE_PREFIX}-qt5-charts"
+            "${MINGW_PACKAGE_PREFIX}-qt5-svg"
+            "${MINGW_PACKAGE_PREFIX}-qt5-datavis3d"
+            "${MINGW_PACKAGE_PREFIX}-qt5-activeqt"
+            "${MINGW_PACKAGE_PREFIX}-qt5-webchannel"
+            "${MINGW_PACKAGE_PREFIX}-qt5-websockets"
+            "${MINGW_PACKAGE_PREFIX}-qt5-3d")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-shiboken2-qt5=${pkgver}")
+             "${MINGW_PACKAGE_PREFIX}-qt5-winextras"
+             "${MINGW_PACKAGE_PREFIX}-qt5-xmlpatterns"
+             "${MINGW_PACKAGE_PREFIX}-qt5-tools"
+             "${MINGW_PACKAGE_PREFIX}-qt5-multimedia"
+             "${MINGW_PACKAGE_PREFIX}-qt5-location"
+             "${MINGW_PACKAGE_PREFIX}-qt5-quickcontrols2"
+             "${MINGW_PACKAGE_PREFIX}-qt5-remoteobjects"
+             "${MINGW_PACKAGE_PREFIX}-qt5-scxml"
+             "${MINGW_PACKAGE_PREFIX}-qt5-script"
+             "${MINGW_PACKAGE_PREFIX}-qt5-sensors"
+             "${MINGW_PACKAGE_PREFIX}-qt5-serialport"
+             "${MINGW_PACKAGE_PREFIX}-qt5-speech"
+             "${MINGW_PACKAGE_PREFIX}-qt5-charts"
+             "${MINGW_PACKAGE_PREFIX}-qt5-svg"
+             "${MINGW_PACKAGE_PREFIX}-qt5-datavis3d"
+             "${MINGW_PACKAGE_PREFIX}-qt5-activeqt"
+             "${MINGW_PACKAGE_PREFIX}-qt5-webchannel"
+             "${MINGW_PACKAGE_PREFIX}-qt5-websockets"
+             "${MINGW_PACKAGE_PREFIX}-qt5-3d"
+             "${MINGW_PACKAGE_PREFIX}-qt5-gamepad")
 options=('staticlibs' 'strip')
 _pkgfqn=pyside-setup-opensource-src-$pkgver
 source=(https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${pkgver}-src/${_pkgfqn}.tar.xz
@@ -31,8 +69,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -49,8 +87,8 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${MINGW_CHOST}
-  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  cd "${srcdir}"/build-${MSYSTEM}
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake.exe --install .
 
   local _PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   for _f in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do