diff --git a/mingw-w64-apr/PKGBUILD b/mingw-w64-apr/PKGBUILD
index 0d6eeba030..8433f75e49 100644
--- a/mingw-w64-apr/PKGBUILD
+++ b/mingw-w64-apr/PKGBUILD
@@ -9,6 +9,7 @@ pkgdesc="The Apache Portable Runtime (mingw-w64)"
 arch=('any')
 url="https://apr.apache.org/"
 license=('APACHE')
+validpgpkeys=('B1B96F45DFBDCCF974019235193F180AB55D9977')
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-libtool"
              "${MINGW_PACKAGE_PREFIX}-python")
@@ -17,7 +18,7 @@ source=(https://www.apache.org/dist/apr/${_realname}-${pkgver}.tar.bz2{,.asc}
         'apr_wtypes.patch')
 sha256sums=('a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105'
             'SKIP'
-            'cd75b79706dceba2af20f9e9a2d05032eacaf6f04edecb3a21f11594c0ccee4b'
+            'ba7d6de7e7930801df483d444b97c159af4ff11b4ce27e1337aea5e0417e6066'
             'b82dd98ec8cff2273fb071dc9f1d2ee7466905c9b82a12d3d83ce1cb5920a5d6')
 
 prepare() {
diff --git a/mingw-w64-apr/apr_ssize_t.patch b/mingw-w64-apr/apr_ssize_t.patch
index 5cb261b909..addf78098a 100644
--- a/mingw-w64-apr/apr_ssize_t.patch
+++ b/mingw-w64-apr/apr_ssize_t.patch
@@ -7,8 +7,8 @@ Index: configure.in
      ssize_t_fmt="ld"
      AC_MSG_RESULT(%ld)
 +elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_long_long"; then
-+    ssize_t_fmt="lld"
-+    AC_MSG_RESULT(%lld)
++    ssize_t_fmt="I64d"
++    AC_MSG_RESULT(%I64d)
  else
      AC_ERROR([could not determine the proper format for apr_ssize_t])
  fi
@@ -17,8 +17,8 @@ Index: configure.in
      size_t_fmt="ld"
      AC_MSG_RESULT(%ld)
 +elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long_long"; then
-+    size_t_fmt="lld"
-+    AC_MSG_RESULT(%lld)
++    size_t_fmt="I64d"
++    AC_MSG_RESULT(%I64d)
  else
      AC_ERROR([could not determine the proper format for apr_size_t])
  fi