diff --git a/mingw-w64-libiconv/0004-fix-makefile-devel-assuming-gcc.patch b/mingw-w64-libiconv/0004-fix-makefile-devel-assuming-gcc.patch
deleted file mode 100644
index 80905eeafb..0000000000
--- a/mingw-w64-libiconv/0004-fix-makefile-devel-assuming-gcc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN a/Makefile.devel b/Makefile.devel
---- a/Makefile.devel	2022-01-24 04:49:47 +0000
-+++ b/Makefile.devel	2023-01-14 18:28:46 +0000
-@@ -9,7 +9,7 @@
- AUTOMAKE = automake-1.16
- ACLOCAL = aclocal-1.16
- GPERF = gperf
--CC = gcc -Wall
-+CC = cc -Wall
- CFLAGS = -O
- MAN2HTML = groff -mandoc -Thtml
- CP = cp
diff --git a/mingw-w64-libiconv/PKGBUILD b/mingw-w64-libiconv/PKGBUILD
index 5239aef0be..1921f2bdf1 100644
--- a/mingw-w64-libiconv/PKGBUILD
+++ b/mingw-w64-libiconv/PKGBUILD
@@ -4,32 +4,29 @@
 _realname=libiconv
 pkgbase=mingw-w64-${_realname}
 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname} ${MINGW_PACKAGE_PREFIX}-iconv)
-license=('spdx:GPL-3.0-or-later')
 pkgdesc='Character encoding conversion library and utility (mingw-w64)'
-pkgver=1.17
-pkgrel=4
+pkgver=1.18
+pkgrel=1
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://www.gnu.org/software/libiconv/'
+license=('spdx:GPL-3.0-or-later')
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools"
+             "${MINGW_PACKAGE_PREFIX}-gettext-tools"
+             "${MINGW_PACKAGE_PREFIX}-gperf")
 source=("https://ftp.gnu.org/pub/gnu/${_realname}/${_realname}-${pkgver}.tar.gz"{,.sig}
-        0004-fix-makefile-devel-assuming-gcc.patch
         0003-add-cp65001-as-utf8-alias.patch
         0002-fix-cr-for-awk-in-configure.all.patch
         fix-pointer-buf.patch
         iconv.pc)
-sha256sums=('8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313'
+sha256sums=('3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8'
             'SKIP'
-            '2f08ca8681e4c85cdb2e6835921a502fd623dee4bf8ca10aa3c66747ede58a47'
             'cb2b1cca44c9b9bd11c3bd33997c10d22dff263542275324c88f34b59910ef87'
             '89d5c0f666e50a0186cfb142ba7b77e8fe1ac4d65bdfd9ae14ae8d2f0045a87c'
             '6b6e2393840f4dc6067587165777b1a07978f4c05247d7c1010a45ad251bbeeb'
             '56e7ec406bf42eb66b1d972f20d229f7a76ba00c38c7b4403bf348875704baae')
 validpgpkeys=('9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D')  # "Bruno Haible (Open Source Development) <bruno@clisp.org>"
-options=('!libtool' 'staticlibs')
-makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-gettext-tools"
-             "${MINGW_PACKAGE_PREFIX}-gperf")
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -41,28 +38,25 @@ apply_patch_with_msg() {
 
 regenerate_files() {
   msg2 "Regenerating autogenerated files"
-  make -f Makefile.devel all
+  CC=${CC} make -f Makefile.devel all
 }
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
+
   apply_patch_with_msg \
     0002-fix-cr-for-awk-in-configure.all.patch \
     fix-pointer-buf.patch \
-    0003-add-cp65001-as-utf8-alias.patch \
-    0004-fix-makefile-devel-assuming-gcc.patch
+    0003-add-cp65001-as-utf8-alias.patch
+
   regenerate_files
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
     --docdir=${MINGW_PREFIX}/share/doc/libiconv \
     --enable-static \
     --enable-shared \