diff --git a/mingw-w64-qt5-doc/PKGBUILD b/mingw-w64-qt5-doc/PKGBUILD
index 43a3da41bf..eda18d0a31 100644
--- a/mingw-w64-qt5-doc/PKGBUILD
+++ b/mingw-w64-qt5-doc/PKGBUILD
@@ -11,10 +11,10 @@ fi
 _realname=qt5-doc
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=5.15.11
+pkgver=5.15.12
 pkgrel=1
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 pkgdesc="A cross-platform application and UI framework (Documentation) (mingw-w64)"
 url='https://www.qt.io/'
 msys2_references=(
@@ -43,7 +43,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-tools"
              "${MINGW_PACKAGE_PREFIX}-vulkan-headers"
              "${MINGW_PACKAGE_PREFIX}-libmariadbclient"
              "${MINGW_PACKAGE_PREFIX}-postgresql"
-             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-firebird2")
             )
 groups=("${MINGW_PACKAGE_PREFIX}-qt5")
 _pkgfile="qt-everywhere-opensource-src-${pkgver}"
@@ -84,7 +83,7 @@ source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/singl
         0302-ugly-hack-disable-qdoc-build.patch
         0304-qtdeclarative-disable-dx12.patch
         0310-fix-assimp-not-found.patch)
-sha256sums=('7426b1eaab52ed169ce53804bdd05dfe364f761468f888a0f15a308dc1dc2951'
+sha256sums=('93f2c0889ee2e9cdf30c170d353c3f829de5f29ba21c119167dee5995e48ccce'
             '884b32f0e2e1bb110330a921b69443379a7be98c42f13754f9c5f56c040ba3b7'
             '617e6fa85a92353d0073425d37cd5d90d92cb7f906d66dd2d0df576122d091a4'
             '27ce2161b5dbea2fcce6b15948ab722a71036d056420854f6554969f683583bb'
@@ -188,14 +187,9 @@ prepare() {
   fi
 
   local _ARCH_TUNE=
-  case ${MINGW_CHOST} in
-    i686*)
-      _ARCH_TUNE="-march=pentium4 -mtune=generic"
-    ;;
-    x86_64*)
-      _ARCH_TUNE="-march=nocona -msahf -mtune=generic"
-    ;;
-  esac
+  if [[ ${CARCH} == x86_64 ]]; then
+    _ARCH_TUNE="-march=nocona -msahf -mtune=generic"
+  fi
 
   BIGOBJ_FLAGS="-Wa,-mbig-obj"
 
@@ -218,14 +212,6 @@ prepare() {
 build() {
   cd ${MSYSTEM}
 
-  local -a _sql_config
-  if [[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]]; then
-    _sql_config+=("-plugin-sql-ibase")
-  fi
-  _sql_config+=("-plugin-sql-psql")
-  _sql_config+=("-plugin-sql-mysql")
-  _sql_config+=("-plugin-sql-odbc")
-
   export PATH="${srcdir}/${MSYSTEM}/qtbase/bin:${PATH}"
   export LLVM_INSTALL_DIR=${MINGW_PREFIX}
   export VULKAN_SDK=${MINGW_PREFIX}
@@ -264,7 +250,9 @@ build() {
     -no-gstreamer \
     -no-wmf \
     -no-mng \
-    "${_sql_config[@]}"
+    -plugin-sql-psql \
+    -plugin-sql-mysql \
+    -plugin-sql-odbc
 
   make docs
 }