diff --git a/mingw-w64-qca-qt5/PKGBUILD b/mingw-w64-qca-qt5/PKGBUILD
index 29bd570689..d3a37a4395 100644
--- a/mingw-w64-qca-qt5/PKGBUILD
+++ b/mingw-w64-qca-qt5/PKGBUILD
@@ -4,10 +4,10 @@ _realname=qca
 pkgbase=mingw-w64-${_realname}-qt5
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-qt5"
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt Cryptographic Architecture (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="http://delta.affinix.com/qca/"
 license=('LGPL')
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-qt5-git")
@@ -22,8 +22,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-ca-certificates"
          "${MINGW_PACKAGE_PREFIX}-libgcrypt"
          "${MINGW_PACKAGE_PREFIX}-nss"
          "${MINGW_PACKAGE_PREFIX}-openssl"
-         "${MINGW_PACKAGE_PREFIX}-qt5")
-install=${_realname}-qt5-git-${CARCH}.install
+         "${MINGW_PACKAGE_PREFIX}-qt5-base")
+install=${_realname}-qt5-git-${MSYSTEM}.install
 source=("https://download.kde.org/stable/${_realname}/${pkgver}/${_realname}-${pkgver}.tar.xz"{,.sig}
         "cyrus_sasl_linking.patch"
         "qt5-custom-dirs.patch"
@@ -35,7 +35,7 @@ sha256sums=('c13851109abefc4623370989fae3a745bf6b1acb3c2a13a8958539823e974e4b'
             'a5eeb6e2c3e884b54dc3837509d1cbde4611623a2888775ddb7e3868b1623e7c'
             '54b4a38ebb80939dbe6de149e6da8bffb98784c7358ffff4a940c4c9212296b2'
             'ba7e835e30306f415168b1f8c31adda7e6c3881c96ad74d0bcb52466113c5ba4'
-            '57602e5272a079ca1e8f4b4452030094010c7a6b33ed4606e1497cd0b4126717'
+            '8ed2205a66d5b73ee6e8841610be32fe7295b8759504af4e0c14c8c09d6811d0'
             '037b615f8b6f609112383b69e6050e7c939b12b0c7c0fa210a58e075c0d1c589')
 validpgpkeys=('CB9387521E1EE0127DA804843FDBB55084CC5D84')
 
@@ -49,9 +49,9 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir ${srcdir}/build-${MINGW_CHOST}
-  cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir ${srcdir}/build-${MSYSTEM}
+  cd ${srcdir}/build-${MSYSTEM}
 
   #QC_CERTSTORE_PATH=${MINGW_PREFIX}/ssl/certs/ca-bundle.crt
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;DQC_CERTSTORE_PATH=" \
@@ -66,10 +66,10 @@ build() {
     -DQCA_INSTALL_IN_QT_PREFIX=ON \
     ../${_realname}-${pkgver}.
 
-  make ${MAKEFLAGS}
+  cmake --build .
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
-  make DESTDIR="${pkgdir}" install
+  cd ${srcdir}/build-${MSYSTEM}
+  DESTDIR="${pkgdir}" cmake --install .
 }
diff --git a/mingw-w64-qca-qt5/qca-mingw-custom-certificates.patch b/mingw-w64-qca-qt5/qca-mingw-custom-certificates.patch
index f96d67d0b8..9b088680c6 100644
--- a/mingw-w64-qca-qt5/qca-mingw-custom-certificates.patch
+++ b/mingw-w64-qca-qt5/qca-mingw-custom-certificates.patch
@@ -11,26 +11,16 @@
      # USE BUILTIN
  else()
    if ( DEFINED ENV{QC_CERTSTORE_PATH} )
-@@ -300,6 +301,8 @@
-       endif()
+@@ -301,6 +302,9 @@
      endforeach (_current_try)
    endif()
+ endif()
 +else()
 +  set(qca_CERTSTORE ${QCA_SYSTEMSTORE_PATH})
- endif()
- 
- if (qca_CERTSTORE)
-@@ -316,6 +317,10 @@
- endif()
- message(STATUS "certstore path: " ${qca_CERTSTORE})
- add_definitions( -DQCA_SYSTEMSTORE_PATH="${qca_CERTSTORE}" )
-+else()
-+message(STATUS "certstore path: " ${QCA_SYSTEMSTORE_PATH})
-+add_definitions( -DQCA_SYSTEMSTORE_PATH="${qca_CERTSTORE}" )
 +endif()
  
- 
- set( private_HEADERS ${qca_INCLUDEDIR}/QtCrypto/qca_plugin.h ${qca_INCLUDEDIR}/QtCrypto/qca_systemstore.h )
+ if (qca_CERTSTORE)
+   message(STATUS "Found system certstore")
 --- qca/src/CMakeLists.txt.orig	2015-07-16 11:09:16.212688400 +0300
 +++ qca/src/CMakeLists.txt	2015-07-16 11:16:34.878817400 +0300
 @@ -50,7 +50,7 @@
diff --git a/mingw-w64-qca-qt5/qca-qt5-git-CLANG32.install b/mingw-w64-qca-qt5/qca-qt5-git-CLANG32.install
new file mode 100644
index 0000000000..80921bb161
--- /dev/null
+++ b/mingw-w64-qca-qt5/qca-qt5-git-CLANG32.install
@@ -0,0 +1,11 @@
+post_install() {
+  local _real_prefix=/clang32
+  local _prefix=$(cygpath -wm ${_real_prefix})
+  for f in ${_real_prefix}/lib/cmake/Qca-qt5/*.cmake; do
+    sed -s "s|${_real_prefix}|${_prefix}|g" -i ${f}
+  done
+}
+
+post_upgrade() {
+  post_install
+}
diff --git a/mingw-w64-qca-qt5/qca-qt5-git-CLANG64.install b/mingw-w64-qca-qt5/qca-qt5-git-CLANG64.install
new file mode 100644
index 0000000000..9b2c395948
--- /dev/null
+++ b/mingw-w64-qca-qt5/qca-qt5-git-CLANG64.install
@@ -0,0 +1,11 @@
+post_install() {
+  local _real_prefix=/clang64
+  local _prefix=$(cygpath -wm ${_real_prefix})
+  for f in ${_real_prefix}/lib/cmake/Qca-qt5/*.cmake; do
+    sed -s "s|${_real_prefix}|${_prefix}|g" -i ${f}
+  done
+}
+
+post_upgrade() {
+  post_install
+}
diff --git a/mingw-w64-qca-qt5/qca-qt5-git-i686.install b/mingw-w64-qca-qt5/qca-qt5-git-MINGW32.install
similarity index 100%
rename from mingw-w64-qca-qt5/qca-qt5-git-i686.install
rename to mingw-w64-qca-qt5/qca-qt5-git-MINGW32.install
diff --git a/mingw-w64-qca-qt5/qca-qt5-git-x86_64.install b/mingw-w64-qca-qt5/qca-qt5-git-MINGW64.install
similarity index 100%
rename from mingw-w64-qca-qt5/qca-qt5-git-x86_64.install
rename to mingw-w64-qca-qt5/qca-qt5-git-MINGW64.install
diff --git a/mingw-w64-qca-qt5/qca-qt5-git-UCRT64.install b/mingw-w64-qca-qt5/qca-qt5-git-UCRT64.install
new file mode 100644
index 0000000000..5dc7c600e0
--- /dev/null
+++ b/mingw-w64-qca-qt5/qca-qt5-git-UCRT64.install
@@ -0,0 +1,11 @@
+post_install() {
+  local _real_prefix=/ucrt64
+  local _prefix=$(cygpath -wm ${_real_prefix})
+  for f in ${_real_prefix}/lib/cmake/Qca-qt5/*.cmake; do
+    sed -s "s|${_real_prefix}|${_prefix}|g" -i ${f}
+  done
+}
+
+post_upgrade() {
+  post_install
+}