diff --git a/mingw-w64-msmtp/PKGBUILD b/mingw-w64-msmtp/PKGBUILD
index 84635d8bb7..f1dbb8356a 100644
--- a/mingw-w64-msmtp/PKGBUILD
+++ b/mingw-w64-msmtp/PKGBUILD
@@ -3,12 +3,12 @@
 _realname=msmtp
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=1.8.19
+pkgver=1.8.22
 pkgrel=1
 pkgdesc="An SMTP client (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
-license=('GPL2+')
+license=('spdx:GPL-3.0-or-later')
 url="https://msmtp.sourceforge.io/"
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
 depends=("${MINGW_PACKAGE_PREFIX}-gettext"
@@ -20,10 +20,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-gettext"
 options=('strip')
 source=(https://marlam.de/msmtp/releases/${_realname}-${pkgver}.tar.xz{,.sig}
         '0001-include-winsock2.patch')
-sha256sums=('34a1e1981176874dbe4ee66ee0d9103c90989aa4dcdc4861e4de05ce7e44526b'
+sha256sums=('1b04206286a5b82622335e4eb09e17074368b7288e53d134543cbbc6b79ea3e7'
             'SKIP'
             '3729fc8d9a11370324561a76cafe09035391e48c9a55876d1aaa5077944ebf8d')
-validpgpkeys=('2F61B4828BBA779AECB3F32703A2A4AB1E32FD34')
+validpgpkeys=('2F61B4828BBA779AECB3F32703A2A4AB1E32FD34') # Martin Lambers <marlam@marlam.de>
 
 prepare () {
   cd ${srcdir}/${_realname}-${pkgver}
@@ -33,8 +33,9 @@ prepare () {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
+  LDFLAGS+=" -lpthread" \
   ../${_realname}-${pkgver}/configure \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
@@ -46,7 +47,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   install -Dm0644 ${srcdir}/${_realname}-${pkgver}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
 }