diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake
index a66e51cba07104..4e3eb3f08b071b 100644
--- a/ports/gtk3/portfile.cmake
+++ b/ports/gtk3/portfile.cmake
@@ -38,7 +38,7 @@ else()
     list(APPEND OPTIONS_RELEASE -Dintrospection=false)
 endif()
 
-if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD)
+if("wayland" IN_LIST FEATURES)
     list(APPEND OPTIONS -Dwayland_backend=true)
 else()
     list(APPEND OPTIONS -Dwayland_backend=false)
diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json
index 496505656f9ef0..e4e33fd0f44d70 100644
--- a/ports/gtk3/vcpkg.json
+++ b/ports/gtk3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gtk3",
   "version": "3.24.51",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Portable library for creating graphical user interfaces.",
   "homepage": "https://www.gtk.org/",
   "license": null,
@@ -53,14 +53,6 @@
     {
       "name": "vcpkg-tool-meson",
       "host": true
-    },
-    {
-      "name": "wayland",
-      "platform": "linux | freebsd | openbsd"
-    },
-    {
-      "name": "wayland-protocols",
-      "platform": "linux | freebsd | openbsd"
     }
   ],
   "features": {
@@ -91,6 +83,14 @@
           ]
         }
       ]
+    },
+    "wayland": {
+      "description": "Build with Wayland support",
+      "supports": "linux | freebsd | openbsd",
+      "dependencies": [
+        "wayland",
+        "wayland-protocols"
+      ]
     }
   }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 49123a37932e73..35bf675052d13e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3554,7 +3554,7 @@
     },
     "gtk3": {
       "baseline": "3.24.51",
-      "port-version": 1
+      "port-version": 2
     },
     "gtkmm": {
       "baseline": "4.14.0",
diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json
index ef6251aeac4774..99442919e02258 100644
--- a/versions/g-/gtk3.json
+++ b/versions/g-/gtk3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8a829ae7e34f4a45e44afea6cb9fac96ea074274",
+      "version": "3.24.51",
+      "port-version": 2
+    },
     {
       "git-tree": "13503599f7ef571b58ef8a9897a2aabd972945be",
       "version": "3.24.51",