diff --git a/ports/gettext-libintl/portfile.cmake b/ports/gettext-libintl/portfile.cmake
index b72e7f7b87..7d203a4b1f 100644
--- a/ports/gettext-libintl/portfile.cmake
+++ b/ports/gettext-libintl/portfile.cmake
@@ -16,7 +16,7 @@ vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz"
          "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.gz"
     FILENAME "gettext-${VERSION}.tar.gz"
-    SHA512 ad2fa2f69be996a637e9b51e8941a39e10050060245dcec1fe75c15b68d0ff973043c87b77e4e2830e407e3bdd040b578f8e24fd05bba43adb94eaee34001aa5
+    SHA512 d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH
diff --git a/ports/gettext-libintl/vcpkg-cmake-wrapper.cmake b/ports/gettext-libintl/vcpkg-cmake-wrapper.cmake
index 03bcb0569d..7a23dfc0cd 100644
--- a/ports/gettext-libintl/vcpkg-cmake-wrapper.cmake
+++ b/ports/gettext-libintl/vcpkg-cmake-wrapper.cmake
@@ -10,5 +10,8 @@ if(Intl_FOUND AND Intl_LIBRARIES)
     find_package(Iconv) # Since CMake 3.11
     if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN)
         list(APPEND Intl_LIBRARIES ${Iconv_LIBRARIES})
+        if(TARGET Intl::Intl) # Since CMake 3.20
+            set_property(TARGET Intl::Intl APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<LINK_ONLY:Iconv::Iconv>)
+        endif()
     endif()
 endif()
diff --git a/ports/gettext-libintl/vcpkg.json b/ports/gettext-libintl/vcpkg.json
index a86c4b7b68..473361f250 100644
--- a/ports/gettext-libintl/vcpkg.json
+++ b/ports/gettext-libintl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gettext-libintl",
-  "version": "0.22.4",
-  "port-version": 1,
+  "version": "0.22.5",
   "description": "The libintl C library from GNU gettext-runtime.",
   "homepage": "https://www.gnu.org/software/gettext/",
   "license": "LGPL-2.1-or-later",
diff --git a/ports/gettext/install-autopoint.cmake b/ports/gettext/install-autopoint.cmake
index 6406b25085..59e383b1c3 100644
--- a/ports/gettext/install-autopoint.cmake
+++ b/ports/gettext/install-autopoint.cmake
@@ -26,7 +26,7 @@ function(install_autopoint)
     configure_file("${SOURCE_PATH}/gettext-tools/misc/autopoint.in" "${WORKING_DIR}/autopoint" @ONLY)
 
     # data tarball
-    if(WIN32)
+    if(CMAKE_HOST_WIN32)
         vcpkg_acquire_msys(MSYS_ROOT PACKAGES gzip)
         vcpkg_add_to_path("${MSYS_ROOT}/usr/bin")
     endif()
diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake
index fe4796a876..2be1104c9b 100644
--- a/ports/gettext/portfile.cmake
+++ b/ports/gettext/portfile.cmake
@@ -16,7 +16,7 @@ vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz"
          "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.gz"
     FILENAME "gettext-${VERSION}.tar.gz"
-    SHA512 ad2fa2f69be996a637e9b51e8941a39e10050060245dcec1fe75c15b68d0ff973043c87b77e4e2830e407e3bdd040b578f8e24fd05bba43adb94eaee34001aa5
+    SHA512 d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH
diff --git a/ports/gettext/uwp.patch b/ports/gettext/uwp.patch
index 69dc5872de..6fb61e5677 100644
--- a/ports/gettext/uwp.patch
+++ b/ports/gettext/uwp.patch
@@ -38,10 +38,10 @@ index ec75427..9e063e4 100644
  # elif defined WINDOWS_NATIVE
  
    char buf[2 + 10 + 1];
-diff --git a/gettext-runtime/gnulib-lib/localename.c b/gettext-runtime/gnulib-lib/localename.c
+diff --git a/gettext-runtime/gnulib-lib/localename-unsafe.c b/gettext-runtime/gnulib-lib/localename-unsafe.c
 index d77bb81..3c6e055 100644
---- a/gettext-runtime/gnulib-lib/localename.c
-+++ b/gettext-runtime/gnulib-lib/localename.c
+--- a/gettext-runtime/gnulib-lib/localename-unsafe.c
++++ b/gettext-runtime/gnulib-lib/localename-unsafe.c
 @@ -69,6 +69,11 @@ extern char * getlocalename_l(int, locale_t);
  
  #if defined _WIN32 && !defined __CYGWIN__
diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json
index 2eb67e19dd..124612fe8f 100644
--- a/ports/gettext/vcpkg.json
+++ b/ports/gettext/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gettext",
-  "version": "0.22.4",
-  "port-version": 2,
+  "version": "0.22.5",
   "description": "A GNU framework to help produce multi-lingual messages.",
   "homepage": "https://www.gnu.org/software/gettext/",
   "license": "GPL-3.0-only",
diff --git a/versions/baseline.json b/versions/baseline.json
index 20b24510df..fb928ba273 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2973,12 +2973,12 @@
       "port-version": 0
     },
     "gettext": {
-      "baseline": "0.22.4",
-      "port-version": 2
+      "baseline": "0.22.5",
+      "port-version": 0
     },
     "gettext-libintl": {
-      "baseline": "0.22.4",
-      "port-version": 1
+      "baseline": "0.22.5",
+      "port-version": 0
     },
     "gettimeofday": {
       "baseline": "2017-10-14",
diff --git a/versions/g-/gettext-libintl.json b/versions/g-/gettext-libintl.json
index 808a708f96..dc7742a501 100644
--- a/versions/g-/gettext-libintl.json
+++ b/versions/g-/gettext-libintl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8a3f80e31783a834e0fdc9d231136651cb2f08b4",
+      "version": "0.22.5",
+      "port-version": 0
+    },
     {
       "git-tree": "b81c3757a4f5b2eb78c45e29d51803e5a3418fdb",
       "version": "0.22.4",
diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json
index d5a06f5c7d..fe10aa1b9a 100644
--- a/versions/g-/gettext.json
+++ b/versions/g-/gettext.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a9e016b098d97663485848b70db782306ecde601",
+      "version": "0.22.5",
+      "port-version": 0
+    },
     {
       "git-tree": "d9cc9b8256d9653fe2d484ecf268f7368666d942",
       "version": "0.22.4",