diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json
index f907a9babdb175..972a4d67f6f998 100644
--- a/ports/gmp/vcpkg.json
+++ b/ports/gmp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gmp",
   "version-string": "6.2.1",
-  "port-version": 7,
+  "port-version": 8,
   "description": "The GNU Multiple Precision Arithmetic Library",
   "homepage": "https://gmplib.org",
   "supports": "!(windows & (arm | arm64))",
@@ -12,8 +12,11 @@
       "platform": "windows"
     },
     {
-      "name": "yasm-tool",
+      "name": "yasm",
       "host": true,
+      "features": [
+        "tools"
+      ],
       "platform": "windows"
     }
   ]
diff --git a/ports/yasm-tool-helper/vcpkg.json b/ports/yasm-tool-helper/vcpkg.json
index 72e1fba3bd2de2..dcc112ce379c14 100644
--- a/ports/yasm-tool-helper/vcpkg.json
+++ b/ports/yasm-tool-helper/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "yasm-tool-helper",
-  "version-string": "2020-03-11",
-  "description": "Backfill that depends on yasm-tool:host",
+  "version-date": "2020-03-11",
+  "port-version": 1,
+  "description": "Backfill that depends on yasm:host",
   "homepage": "https://github.com/Microsoft/vcpkg",
   "dependencies": [
     {
-      "name": "yasm-tool",
-      "host": true
+      "name": "yasm",
+      "host": true,
+      "features": [
+        "tools"
+      ]
     }
   ]
 }
diff --git a/ports/yasm-tool-helper/yasm-tool-helper.cmake.in b/ports/yasm-tool-helper/yasm-tool-helper.cmake.in
index 48bd805f3bf270..8e69ef519e9b25 100644
--- a/ports/yasm-tool-helper/yasm-tool-helper.cmake.in
+++ b/ports/yasm-tool-helper/yasm-tool-helper.cmake.in
@@ -1 +1 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/share/yasm-tool/vcpkg-port-config.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/share/yasm/vcpkg-port-config.cmake")
diff --git a/ports/yasm-tool/portfile.cmake b/ports/yasm-tool/portfile.cmake
index a003621976c873..dba1f83f42edee 100644
--- a/ports/yasm-tool/portfile.cmake
+++ b/ports/yasm-tool/portfile.cmake
@@ -1,45 +1 @@
-if(VCPKG_TARGET_IS_WINDOWS)
-    set(YASM_BUILD_BINARY ON)
-    set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
-    set(VCPKG_LIBRARY_LINKAGE static)
-
-    vcpkg_from_github(
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO yasm/yasm
-        REF 009450c7ad4d425fa5a10ac4bd6efbd25248d823 # 1.3.0 plus bugfixes for https://github.com/yasm/yasm/issues/153
-        SHA512 a542577558676d11b52981925ea6219bffe699faa1682c033b33b7534f5a0dfe9f29c56b32076b68c48f65e0aef7c451be3a3af804c52caa4d4357de4caad83c
-    )
-
-    file(INSTALL "${SOURCE_PATH}/COPYING"
-        DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-        RENAME copyright)
-    foreach(LICENSE Artistic.txt BSD.txt GNU_GPL-2.0 GNU_LGPL-2.0)
-        file(COPY "${SOURCE_PATH}/${LICENSE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-    endforeach()
-
-    vcpkg_find_acquire_program(PYTHON3)
-    get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-    vcpkg_add_to_path("${PYTHON3_DIR}")
-
-    vcpkg_configure_cmake(
-        SOURCE_PATH ${SOURCE_PATH}
-        PREFER_NINJA
-        OPTIONS
-            -DENABLE_NLS=OFF
-            -DYASM_BUILD_TESTS=OFF
-    )
-    vcpkg_install_cmake()
-
-    vcpkg_copy_tools(TOOL_NAMES yasm)
-
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include")
-else()
-    set(YASM_BUILD_BINARY OFF)
-    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-endif()
-
-configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake.in"
-    "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY)
+SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/yasm-tool/vcpkg.json b/ports/yasm-tool/vcpkg.json
index 7e5fb52b29dff2..e78d6b53672d35 100644
--- a/ports/yasm-tool/vcpkg.json
+++ b/ports/yasm-tool/vcpkg.json
@@ -1,8 +1,13 @@
 {
   "name": "yasm-tool",
-  "version": "1.3.0",
-  "port-version": 1,
-  "description": "A modular assembler.",
-  "homepage": "http://yasm.tortall.net/",
-  "supports": "native & !uwp"
+  "version-date": "2021-12-14",
+  "description": "Legacy port. Use port yasm instead.",
+  "dependencies": [
+    {
+      "name": "yasm",
+      "features": [
+        "tools"
+      ]
+    }
+  ]
 }
diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake
index 22b194b7f5a692..37a891dc09e6af 100644
--- a/ports/yasm/portfile.cmake
+++ b/ports/yasm/portfile.cmake
@@ -29,11 +29,11 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 if (BUILD_TOOLS)
+    vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm AUTO_CLEAN)
     if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
         file(COPY "${CURRENT_PACKAGES_DIR}/bin/yasmstd${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
             DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
     endif()
-    vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm AUTO_CLEAN)
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
@@ -42,5 +42,7 @@ endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
+configure_file("${CURRENT_PORT_DIR}/vcpkg-port-config.cmake.in"
+    "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY)
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/yasm-tool/vcpkg-port-config.cmake.in b/ports/yasm/vcpkg-port-config.cmake.in
similarity index 81%
rename from ports/yasm-tool/vcpkg-port-config.cmake.in
rename to ports/yasm/vcpkg-port-config.cmake.in
index 5abe7520aca905..af374280554fa9 100644
--- a/ports/yasm-tool/vcpkg-port-config.cmake.in
+++ b/ports/yasm/vcpkg-port-config.cmake.in
@@ -11,11 +11,7 @@ function(yasm_tool_helper)
         message(FATAL_ERROR "Unexpected arguments to yasm_tool_helper: ${arg_UNPARSED_ARGUMENTS}")
     endif()
 
-    if(@YASM_BUILD_BINARY@)
-        set(YASM "${Z_YASM_TOOL_HELPER_LIST_DIR}/../../tools/yasm-tool/yasm.exe")
-    else()
-        vcpkg_find_acquire_program(YASM)
-    endif()
+    find_program(YASM yasm PATHS "${Z_YASM_TOOL_HELPER_LIST_DIR}/../../tools/yasm")
 
     if(arg_APPEND_TO_PATH)
         get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
diff --git a/ports/yasm/vcpkg.json b/ports/yasm/vcpkg.json
index d4ffbf9bddeb85..f78ff774575d80 100644
--- a/ports/yasm/vcpkg.json
+++ b/ports/yasm/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "yasm",
-  "version-string": "1.3.0",
-  "port-version": 2,
+  "version": "1.3.0",
+  "port-version": 3,
   "description": "Yasm is a complete rewrite of the NASM assembler under the new BSD License.",
   "homepage": "https://github.com/yasm/yasm",
   "supports": "windows & !uwp & !arm",
diff --git a/versions/baseline.json b/versions/baseline.json
index 6b3147e52ca18c..116d109bea04f3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2526,7 +2526,7 @@
     },
     "gmp": {
       "baseline": "6.2.1",
-      "port-version": 7
+      "port-version": 8
     },
     "gmsh": {
       "baseline": "4.9.0",
@@ -7494,15 +7494,15 @@
     },
     "yasm": {
       "baseline": "1.3.0",
-      "port-version": 2
+      "port-version": 3
     },
     "yasm-tool": {
-      "baseline": "1.3.0",
-      "port-version": 1
+      "baseline": "2021-12-14",
+      "port-version": 0
     },
     "yasm-tool-helper": {
       "baseline": "2020-03-11",
-      "port-version": 0
+      "port-version": 1
     },
     "yato": {
       "baseline": "1.0",
diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json
index 52dbc389f06f3d..85c94f62f43b64 100644
--- a/versions/g-/gmp.json
+++ b/versions/g-/gmp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8d09c9addf60d381cabe4c565cb59b27f5b2bdc7",
+      "version-string": "6.2.1",
+      "port-version": 8
+    },
     {
       "git-tree": "5d207c0d8a6481f96f2277fd3245f2a80456a706",
       "version-string": "6.2.1",
diff --git a/versions/y-/yasm-tool-helper.json b/versions/y-/yasm-tool-helper.json
index 606a5eee5603e9..c8ab8dabf50d70 100644
--- a/versions/y-/yasm-tool-helper.json
+++ b/versions/y-/yasm-tool-helper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0a2dfb294bebae79c48cc710756756164175be1d",
+      "version-date": "2020-03-11",
+      "port-version": 1
+    },
     {
       "git-tree": "7d0e3b2224338888cd1e2f7a00c182961a7ea760",
       "version-string": "2020-03-11",
diff --git a/versions/y-/yasm-tool.json b/versions/y-/yasm-tool.json
index 48dfb94e9e26c6..41a4f9b7059125 100644
--- a/versions/y-/yasm-tool.json
+++ b/versions/y-/yasm-tool.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5dc61ac1b2f25ef005c279fd65cd98cbdedc161a",
+      "version-date": "2021-12-14",
+      "port-version": 0
+    },
     {
       "git-tree": "456004e2ac7a578572cb14ebf581c246b869516a",
       "version": "1.3.0",
diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json
index ba2175f48bdb26..8ce7047cc23ea7 100644
--- a/versions/y-/yasm.json
+++ b/versions/y-/yasm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4368509dc3dfe6cab848b8713b22c9c0ef408527",
+      "version": "1.3.0",
+      "port-version": 3
+    },
     {
       "git-tree": "eaab6c3ae3bfc1ffcfaee3b1695d7ee21dacc7b1",
       "version-string": "1.3.0",