diff --git a/mingw-w64-libsigc++-3.0/PKGBUILD b/mingw-w64-libsigc++-3.0/PKGBUILD
index f936086a26..868c8b1342 100644
--- a/mingw-w64-libsigc++-3.0/PKGBUILD
+++ b/mingw-w64-libsigc++-3.0/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=libsigc++
 pkgbase=mingw-w64-${_realname}-3.0
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-3.0"
-pkgver=3.4.0
+pkgver=3.6.0
 pkgrel=1
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}3")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}3")
@@ -12,15 +12,14 @@ pkgdesc="Callback Framework for C++ - V3 (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://libsigcplusplus.github.io/libsigcplusplus/"
-license=("LGPL")
+license=('spdx:LGPL-2.1-or-later')
 makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-cc"
              "mm-common")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-options=('strip' '!debug' 'staticlibs')
 source=("https://github.com/libsigcplusplus/libsigcplusplus/releases/download/${pkgver}/${_realname}-${pkgver}.tar.xz")
-sha256sums=('02e2630ffb5ce93cd52c38423521dfe7063328863a6e96d41d765a6116b8707e')
+sha256sums=('c3d23b37dfd6e39f2e09f091b77b1541fbfa17c4f0b6bf5c89baef7229080e17')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -28,39 +27,27 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
-
-  declare -a _extra_config
-  if check_option "debug" "n"; then
-    _extra_config+=("--buildtype=release")
-  else
-    _extra_config+=("--buildtype=debug")
-  fi
-
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  ${MINGW_PREFIX}/bin/meson.exe \
+  ${MINGW_PREFIX}/bin/meson.exe setup \
     --prefix="${MINGW_PREFIX}" \
-    "${_extra_config[@]}" \
+    --buildtype plain \
     --wrap-mode=nodownload \
     --default-library=both \
     --auto-features=enabled \
     -Dmaintainer-mode=false \
     -Dbuild-documentation=false \
     -Dbuild-examples=true \
-    "../${_realname}-${pkgver}"
+    "${_realname}-${pkgver}" \
+    "build-${MSYSTEM}"
 
-  ${MINGW_PREFIX}/bin/meson.exe compile
+  ${MINGW_PREFIX}/bin/meson.exe compile -C "build-${MSYSTEM}"
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  ${MINGW_PREFIX}/bin/meson.exe test || true
+  ${MINGW_PREFIX}/bin/meson.exe test -C "build-${MSYSTEM}" || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install
-
+  ${MINGW_PREFIX}/bin/meson.exe install -C "build-${MSYSTEM}" --destdir "${pkgdir}"
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}-3.0/COPYING"
 }