diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake
index 9b1f9c9666..087899ae39 100644
--- a/ports/gtk/portfile.cmake
+++ b/ports/gtk/portfile.cmake
@@ -1,3 +1,6 @@
+# It installs only shared libs, regardless build type.
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.gnome.org/
     OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json
index b12107437c..b7be28664d 100644
--- a/ports/gtk/vcpkg.json
+++ b/ports/gtk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gtk",
   "version": "4.10.5",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Portable library for creating graphical user interfaces.",
   "homepage": "https://www.gtk.org/",
   "license": "LGPL-2.0-only",
@@ -24,7 +24,6 @@
       "platform": "linux"
     },
     "gdk-pixbuf",
-    "gettext",
     {
       "name": "gettext",
       "host": true,
@@ -33,6 +32,7 @@
         "tools"
       ]
     },
+    "gettext-libintl",
     "glib",
     {
       "name": "glib",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 450d7ab700..d792c31a1d 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -422,7 +422,6 @@ gstreamer:x64-android=fail
 # upstream issue https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1629.
 gstreamer:x64-windows-static = skip
 gstreamer:x64-windows-static-md = skip
-gtk:x64-windows-static-md=fail
 gul14:arm-neon-android=fail
 gul14:arm64-android=fail
 gul14:x64-android=fail
@@ -1234,6 +1233,12 @@ cmake-user:x64-windows-static-md=pass
 cmake-user:x64-windows-static=pass
 cmake-user:x64-windows=pass
 cmake-user:x86-windows=pass
+gtk:arm64-osx=pass
+gtk:x64-linux=pass
+gtk:x64-osx=pass
+gtk:x64-windows-static-md=pass
+gtk:x64-windows=pass
+gtk:x86-windows=pass
 qt:x64-windows=pass
 # qt:x64-windows-static=pass
 # qt:x64-windows-static-md=pass # hunspell is fail so this cannot pass.
diff --git a/versions/baseline.json b/versions/baseline.json
index 23a76ea1e8..7c9df80cad 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3234,7 +3234,7 @@
     },
     "gtk": {
       "baseline": "4.10.5",
-      "port-version": 1
+      "port-version": 2
     },
     "gtk3": {
       "baseline": "3.24.38",
diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json
index 055364a533..b86c27035b 100644
--- a/versions/g-/gtk.json
+++ b/versions/g-/gtk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "38a496538cd081a8d64d5b2733cb1f2b4fbae559",
+      "version": "4.10.5",
+      "port-version": 2
+    },
     {
       "git-tree": "814624705f6cc11a3468d9c3418bc20521b6b207",
       "version": "4.10.5",