diff --git a/mingw-w64-libiconv/0001-compile-relocatable-in-gnulib.mingw.patch b/mingw-w64-libiconv/0001-compile-relocatable-in-gnulib.mingw.patch
deleted file mode 100644
index 7dc994d658..0000000000
--- a/mingw-w64-libiconv/0001-compile-relocatable-in-gnulib.mingw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libiconv-1.14/configure.orig	2013-03-30 13:27:14 +0400
-+++ libiconv-1.14/configure	2013-03-30 13:39:32 +0400
-@@ -20326,7 +20326,7 @@
- 
- 
- 
--  gl_LIBOBJS="$gl_LIBOBJS progreloc.$ac_objext"
-+  gl_LIBOBJS="$gl_LIBOBJS progreloc.$ac_objext relocatable.$ac_objext"
- 
- fi
- 
diff --git a/mingw-w64-libiconv/0002-fix-cr-for-awk-in-configure.all.patch b/mingw-w64-libiconv/0002-fix-cr-for-awk-in-configure.all.patch
index 049ac15be6..61f502685b 100644
--- a/mingw-w64-libiconv/0002-fix-cr-for-awk-in-configure.all.patch
+++ b/mingw-w64-libiconv/0002-fix-cr-for-awk-in-configure.all.patch
@@ -1,17 +1,7 @@
---- libiconv-1.14/configure.orig	2013-08-04 19:13:45.059307100 +0000
-+++ libiconv-1.14/configure	2013-08-04 19:14:09.009348300 +0000
-@@ -22903,7 +22903,7 @@
- fi
- ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
- if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
--  ac_cs_awk_cr='\\r'
-+  ac_cs_awk_cr='\r'
- else
-   ac_cs_awk_cr=$ac_cr
- fi
---- libiconv-1.14/libcharset/configure.orig	2011-08-07 17:49:19.000000000 +0000
-+++ libiconv-1.14/libcharset/configure	2013-08-04 19:14:51.014182300 +0000
-@@ -12364,7 +12364,7 @@
+diff -urN libiconv-1.17/configure.orig libiconv-1.17/configure
+--- libiconv-1.17/configure.orig	2022-06-09 17:17:33.325129700 +0200
++++ libiconv-1.17/configure	2022-06-09 17:41:31.158194700 +0200
+@@ -31929,7 +31929,7 @@
  fi
  ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
  if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
diff --git a/mingw-w64-libiconv/PKGBUILD b/mingw-w64-libiconv/PKGBUILD
index a33e69548e..e54a8e5047 100644
--- a/mingw-w64-libiconv/PKGBUILD
+++ b/mingw-w64-libiconv/PKGBUILD
@@ -4,36 +4,45 @@
 _realname=libiconv
 pkgbase=mingw-w64-${_realname}
 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname} ${MINGW_PACKAGE_PREFIX}-iconv)
-license=('GPL3')
+license=('spdx:GPL-3.0-or-later')
 pkgdesc='Character encoding conversion library and utility (mingw-w64)'
-pkgver=1.16
-pkgrel=2
+pkgver=1.17
+pkgrel=1
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://www.gnu.org/software/libiconv/'
-source=("https://ftp.gnu.org/pub/gnu/${_realname}/${_realname}-${pkgver}.tar.gz"
-        0001-compile-relocatable-in-gnulib.mingw.patch
+source=("https://ftp.gnu.org/pub/gnu/${_realname}/${_realname}-${pkgver}.tar.gz"{,.sig}
         0002-fix-cr-for-awk-in-configure.all.patch
         fix-pointer-buf.patch
         iconv.pc)
-sha256sums=('e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04'
-            '7e905d21d670672b8a6a3bd80e5b8244b38bb7021a15fc7bdd0229125a3a68ee'
-            'fe1a82f0836d65f895bebe9307bbe70ae53e5c872dd727f2042c46edc7cf060d'
+sha256sums=('8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313'
+            'SKIP'
+            '89d5c0f666e50a0186cfb142ba7b77e8fe1ac4d65bdfd9ae14ae8d2f0045a87c'
             'fc1921f9d8ae21be0d1ee8a037fbb89aa066865f193a4883aa6e673827abba88'
             '56e7ec406bf42eb66b1d972f20d229f7a76ba00c38c7b4403bf348875704baae')
+validpgpkeys=('9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D')  # "Bruno Haible (Open Source Development) <bruno@clisp.org>"
 options=('!libtool' 'staticlibs')
-makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
+
+apply_patch_with_msg() {
+  for _patch in "$@"
+  do
+    msg2 "Applying ${_patch}"
+    patch -Nbp1 -i "${srcdir}/${_patch}"
+  done
+}
 
 prepare() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  patch -p1 -i ${srcdir}/0001-compile-relocatable-in-gnulib.mingw.patch
-  patch -p1 -i ${srcdir}/0002-fix-cr-for-awk-in-configure.all.patch
-  patch -p1 -i ${srcdir}/fix-pointer-buf.patch
+  cd "${srcdir}/${_realname}-${pkgver}"
+  apply_patch_with_msg \
+    0002-fix-cr-for-awk-in-configure.all.patch \
+    fix-pointer-buf.patch
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -53,15 +62,15 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  make check || true
+  cd "${srcdir}/build-${MSYSTEM}"
+  make check || msg2 "tests failed"
 }
 
 package_libiconv() {
   pkgdesc='Character encoding conversion library (mingw-w64)'
-  license=(LGPL2 documentation:'GPL3') # This is LGPL except for documentation, see README
+  license=('spdx:LGPL-2.1-or-later' documentation:'spdx:GPL-3.0-or-later') # This is LGPL except for documentation, see README
 
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make install DESTDIR="${pkgdir}"
   rm -fr "${pkgdir}${MINGW_PREFIX}"/bin/*.exe
   rm -f  "${pkgdir}${MINGW_PREFIX}"/lib/charset.alias
@@ -86,9 +95,9 @@ package_iconv() {
   pkgdesc='Character encoding conversion utility (mingw-w64)'
   depends=("${MINGW_PACKAGE_PREFIX}-libiconv=${pkgver}-${pkgrel}"
            "${MINGW_PACKAGE_PREFIX}-gettext")
-  license=('GPL3')
+  license=('spdx:GPL-3.0-or-later')
 
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make install DESTDIR="${pkgdir}"
   rm -f  "${pkgdir}${MINGW_PREFIX}"/bin/*.dll
   rm -fr "${pkgdir}${MINGW_PREFIX}"/include