diff --git a/ports/urho3d/portfile.cmake b/ports/urho3d/portfile.cmake
index a79dcf2258..37f24735df 100644
--- a/ports/urho3d/portfile.cmake
+++ b/ports/urho3d/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO urho3d/Urho3D
     REF fff115a0c0cd50b8a34dfa20b4c5f33eb4f765c8
-    SHA512 4bddcd1d4165b74134a499616710c382d0463db24382aaa3111b8b38e82818053144d4ecb0ba7156589da1e18d85c0f20e0d847237291685ea80957f0bf7f8be
+    SHA512 d13d310dc4711a305b3d8ee3497e4d3169f0219714f9658dcdc0c771a1834092aa7f2bc1778bc7cb41bd01ab0e52edc061c1a79d1163d454e56b2b8377b8fcea
     HEAD_REF master
     PATCHES
         asm_files.patch
@@ -53,11 +53,11 @@ if ("tools" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_ANDROID)
         SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/urho3d"
         AUTO_CLEAN
     )
-    
+
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/tool" "${CURRENT_PACKAGES_DIR}/debug/bin/tool")
-    
+
     vcpkg_copy_tools(TOOL_NAMES Urho3DPlayer AUTO_CLEAN)
-    
+
     file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/Urho3DPlayer_d${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
 endif()
 
@@ -71,7 +71,7 @@ if ("examples" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_ANDROID)
         endif()
     endforeach()
     vcpkg_copy_tools(TOOL_NAMES ${URHO3D_TOOLS} AUTO_CLEAN)
-    
+
     if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
         foreach(URHO3D_TOOL IN_LIST ${URHO3D_TOOLS})
             file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${URHO3D_TOOL}_d${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
diff --git a/ports/urho3d/vcpkg.json b/ports/urho3d/vcpkg.json
index 5ba230f157..4a3e308ed5 100644
--- a/ports/urho3d/vcpkg.json
+++ b/ports/urho3d/vcpkg.json
@@ -2,7 +2,7 @@
   "$note": "Due to the upstream modification of the dependent source code, the internal port of vcpkg cannot be used.",
   "name": "urho3d",
   "version-date": "2021-03-01",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Urho3D is a free lightweight, cross-platform 2D and 3D game engine implemented in C++ and released under the MIT license. Greatly inspired by OGRE and Horde3D.",
   "homepage": "https://github.com/urho3d/Urho3D",
   "supports": "!(arm | uwp)",
diff --git a/ports/xcb-util-wm/portfile.cmake b/ports/xcb-util-wm/portfile.cmake
index c097f2afc2..82c351925c 100644
--- a/ports/xcb-util-wm/portfile.cmake
+++ b/ports/xcb-util-wm/portfile.cmake
@@ -8,10 +8,10 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lib/libxcb-wm
     REF  0c6681e465c9cc7b1fbb60778ba1eaa61ab01a14 #v 0.4.2
-    SHA512 6af514465eaa98d5417de352bd3e4f3880180f886dc1202c64496cb5a07c82c377afeb9396acf57e20caa73e858fe7e6309f3ed7a74e88eb58e1da1f31ac0bd8
+    SHA512 c8be48000ad2dbe5bd430241745edb16280c2d7e602872ed8e14e6245e64391cbf8f234a4d83aad65c96ec58c3b312f2fe7f0bf01cb82f46b3e50f2358b94741
     HEAD_REF master
     PATCHES build.patch
-) 
+)
 file(TOUCH "${SOURCE_PATH}/m4/dummy")
 set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
 
diff --git a/ports/xcb-util-wm/vcpkg.json b/ports/xcb-util-wm/vcpkg.json
index 2d264d5278..052e6f2438 100644
--- a/ports/xcb-util-wm/vcpkg.json
+++ b/ports/xcb-util-wm/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "xcb-util-wm",
   "version": "0.4.2",
+  "port-version": 1,
   "description": "XCB client and window-manager helpers for ICCCM & EWMH.",
   "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxcb-wm/",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index c3b02fd26b..a2a141b010 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7878,7 +7878,7 @@
     },
     "urho3d": {
       "baseline": "2021-03-01",
-      "port-version": 2
+      "port-version": 3
     },
     "uriparser": {
       "baseline": "0.9.7",
@@ -8322,7 +8322,7 @@
     },
     "xcb-util-wm": {
       "baseline": "0.4.2",
-      "port-version": 0
+      "port-version": 1
     },
     "xerces-c": {
       "baseline": "3.2.4",
diff --git a/versions/u-/urho3d.json b/versions/u-/urho3d.json
index 894984ca80..e0defa3c53 100644
--- a/versions/u-/urho3d.json
+++ b/versions/u-/urho3d.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f9e8452934bac3542907f50fd466a34e44b3fdc",
+      "version-date": "2021-03-01",
+      "port-version": 3
+    },
     {
       "git-tree": "0d6c7a328006bca59755eec70c09a83fe9b1a087",
       "version-date": "2021-03-01",
diff --git a/versions/x-/xcb-util-wm.json b/versions/x-/xcb-util-wm.json
index 30b0940738..4a1ac8848c 100644
--- a/versions/x-/xcb-util-wm.json
+++ b/versions/x-/xcb-util-wm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1979c75a17a0cbdf34fa5044b3cf1fa936c24147",
+      "version": "0.4.2",
+      "port-version": 1
+    },
     {
       "git-tree": "da4d2d3ad49ae54dbeacc5e99c3700cdce16d9bb",
       "version": "0.4.2",