diff --git a/mingw-w64-suil/001-undefined-using.patch b/mingw-w64-suil/001-undefined-using.patch
deleted file mode 100644
index 1fdd3118c3..0000000000
--- a/mingw-w64-suil/001-undefined-using.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -bur suil-0.10.18-orig/src/win_in_gtk2.cpp suil-0.10.18/src/win_in_gtk2.cpp
---- suil-0.10.18-orig/src/win_in_gtk2.cpp	2023-02-01 23:29:52.969298600 -0700
-+++ suil-0.10.18/src/win_in_gtk2.cpp	2023-02-01 23:30:11.184529800 -0700
-@@ -27,9 +27,6 @@
- #define SUIL_WIN_WRAPPER(obj) \
-   (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_WIN_WRAPPER, SuilWinWrapper))
- 
--using SuilWinWrapper      = _SuilWinWrapper;
--using SuilWinWrapperClass = _SuilWinWrapperClass;
--
- struct _SuilWinWrapper {
-   GtkDrawingArea              area;
-   SuilWrapper*                wrapper;
-@@ -44,6 +41,9 @@
-   GtkDrawingAreaClass parent_class;
- };
- 
-+using SuilWinWrapper      = _SuilWinWrapper;
-+using SuilWinWrapperClass = _SuilWinWrapperClass;
-+
- GType
- suil_win_wrapper_get_type(void); // Accessor for SUIL_TYPE_WIN_WRAPPER
- 
diff --git a/mingw-w64-suil/PKGBUILD b/mingw-w64-suil/PKGBUILD
index ac186c3464..ab8065c9af 100644
--- a/mingw-w64-suil/PKGBUILD
+++ b/mingw-w64-suil/PKGBUILD
@@ -2,40 +2,37 @@
 _realname=suil
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.10.18
+pkgver=0.10.20
 pkgrel=1
 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+msys2_references=(
+  'archlinux: suil'
+)
+msys2_documentation_url="https://drobilla.net/docs/suil/"
+msys2_repository_url="https://gitlab.com/lv2/suil/"
 url="https://drobilla.net/software/suil.html"
-license=("spdx:ISC")
+license=("spdx:0BSD OR ISC")
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-cc"
   "${MINGW_PACKAGE_PREFIX}-gtk2"
   "${MINGW_PACKAGE_PREFIX}-gtk3"
-  "${MINGW_PACKAGE_PREFIX}-lv2"
   "${MINGW_PACKAGE_PREFIX}-meson"
   "${MINGW_PACKAGE_PREFIX}-pkgconf"
-  "${MINGW_PACKAGE_PREFIX}-qt5-base" 
+  "${MINGW_PACKAGE_PREFIX}-qt5-base"
 )
-depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
+depends=("${MINGW_PACKAGE_PREFIX}-lv2")
 optdepends=(
   "${MINGW_PACKAGE_PREFIX}-glib2: Support for wrapping Qt5 in GTK3 and GTK2"
   "${MINGW_PACKAGE_PREFIX}-gtk2: Support for wrapping Qt5 in GTK2 and GTK2 in Qt5"
   "${MINGW_PACKAGE_PREFIX}-gtk3: Support for wrapping Qt5 in GTK3"
   "${MINGW_PACKAGE_PREFIX}-qt5-base: support for wrapping Qt5 in GTK3 and GTK2"
 )
-source=("https://download.drobilla.net/${_realname}-${pkgver}.tar.xz"
-        001-undefined-using.patch)
-sha256sums=('84ada094fbe17ad3e765379002f3a0c7149b43b020235e4d7fa41432f206f85f'
-            '39c9465e29e82f5345edce62d5f0263382ceac0e115e640d8fac7d2864f04fe4')
-
-prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  # Workaround for https://gitlab.com/lv2/suil/-/issues/8
-  patch -Np1 -i "${srcdir}/001-undefined-using.patch"
-}
+source=("https://download.drobilla.net/${_realname}-${pkgver}.tar.xz"{,.sig})
+sha256sums=('334a3ed3e73d5e17ff400b3db9801f63809155b0faa8b1b9046f9dd3ffef934e'
+            'SKIP')
+validpgpkeys=('907D226E7E13FA337F014A083672782A9BF368F3') # David Robillard <d@drobilla.net>
 
 build() {
   [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
@@ -43,7 +40,7 @@ build() {
   cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  ${MINGW_PREFIX}/bin/meson.exe \
+  ${MINGW_PREFIX}/bin/meson.exe setup \
     --buildtype=plain \
     --auto-features=enabled \
     --prefix=${MINGW_PREFIX} \
@@ -62,4 +59,4 @@ package() {
 
   install -vDm 644 ${srcdir}/${_realname}-${pkgver}/COPYING -t "${pkgdir}${MINGW_PREFIX}/share/licenses/$_realname/"
   install -vDm 644 ${srcdir}/${_realname}-${pkgver}/{AUTHORS,NEWS,README.md} -t "${pkgdir}${MINGW_PREFIX}/share/doc/$_realname/"
-}
\ No newline at end of file
+}