diff --git a/sapi/quickstart/windows/cygwin-build/install-cygwin.bat b/sapi/quickstart/windows/cygwin-build/install-cygwin.bat
index 86fab39f62..f4b984968f 100644
--- a/sapi/quickstart/windows/cygwin-build/install-cygwin.bat
+++ b/sapi/quickstart/windows/cygwin-build/install-cygwin.bat
@@ -41,6 +41,7 @@ set "PACKAGES=%PACKAGES%,cmake,openssl,binutils"
 set "PACKAGES=%PACKAGES%,libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel"
 set "PACKAGES=%PACKAGES%,libssh2-devel,libidn2-devel"
 set "PACKAGES=%PACKAGES%,libgmp-devel,libsqlite3-devel,libpcre-devel,libpcre2-devel"
+set "PACKAGES=%PACKAGES%,libiconv-devel"
 set "PACKAGES=%PACKAGES%,libMagick-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel"
 set "PACKAGES=%PACKAGES%,zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel"
 set "PACKAGES=%PACKAGES%,libzstd-devel,libbrotli-devel"
diff --git a/sapi/scripts/cygwin/cygwin-build.sh b/sapi/scripts/cygwin/cygwin-build.sh
index 3a429ef900..50da74c35b 100755
--- a/sapi/scripts/cygwin/cygwin-build.sh
+++ b/sapi/scripts/cygwin/cygwin-build.sh
@@ -10,7 +10,6 @@ __PROJECT__=$(
   pwd
 )
 cd ${__PROJECT__}
-
 mkdir -p bin/.libs
 # export LDFLAGS="-all-static"
 LOGICAL_PROCESSORS=$(nproc)
diff --git a/sapi/scripts/cygwin/cygwin-config.sh b/sapi/scripts/cygwin/cygwin-config.sh
index 7c8c50d0ea..97a6587246 100755
--- a/sapi/scripts/cygwin/cygwin-config.sh
+++ b/sapi/scripts/cygwin/cygwin-config.sh
@@ -10,6 +10,9 @@ __PROJECT__=$(
   pwd
 )
 cd ${__PROJECT__}
+sed -i.bak 's/ICONV_ALIASED_LIBICONV/HAVE_ICONV/' ext/iconv/iconv.c
+export PATH=/usr/bin:$PATH
+
 export ICU_CXXFLAGS=" -std=gnu++17 "
 ./buildconf --force
 test -f Makefile && make clean
diff --git a/sapi/scripts/cygwin/install-cygwin.sh b/sapi/scripts/cygwin/install-cygwin.sh
index 9e52a1c29a..3396252460 100644
--- a/sapi/scripts/cygwin/install-cygwin.sh
+++ b/sapi/scripts/cygwin/install-cygwin.sh
@@ -52,6 +52,7 @@ PACKAGES="${PACKAGES},cmake,openssl,binutils"
 PACKAGES="${PACKAGES},libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel"
 PACKAGES="${PACKAGES},libssh2-devel,libidn2-devel"
 PACKAGES="${PACKAGES},libgmp-devel,libsqlite3-devel,libpcre-devel,libpcre2-devel"
+PACKAGES="${PACKAGES},libiconv-devel"
 PACKAGES="${PACKAGES},libMagick-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel"
 PACKAGES="${PACKAGES},zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel"
 PACKAGES="${PACKAGES},libzstd-devel,libbrotli-devel"