diff --git a/ports/libtcod/portfile.cmake b/ports/libtcod/portfile.cmake
index 155042f525..d185df19fb 100644
--- a/ports/libtcod/portfile.cmake
+++ b/ports/libtcod/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF 1.20.1
     SHA512 bef3751dd1b190769163ff7c188479fe100d425fa98d3f0f97a3a81045fe0f0c24690b64bcde29f7af1eb7fd34915371223146598b1f0cab173e69a78c1dfc76
     HEAD_REF develop
+    PATCHES
+        stb-headers.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/ports/libtcod/stb-headers.patch b/ports/libtcod/stb-headers.patch
new file mode 100644
index 0000000000..742ae773a1
--- /dev/null
+++ b/ports/libtcod/stb-headers.patch
@@ -0,0 +1,11 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -91,7 +91,7 @@
+     message("Will be vendored: stb")
+     target_include_directories(${PROJECT_NAME} PRIVATE "vendor/")
+ elseif(LIBTCOD_STB STREQUAL "vcpkg")
+-    find_path(STB_INCLUDE_DIRS "stb.h")
++    find_path(STB_INCLUDE_DIRS stb_ds.h)
+     target_include_directories(${PROJECT_NAME} PRIVATE ${STB_INCLUDE_DIRS})
+ else()
+     message(FATAL_ERROR "Unknown option for LIBTCOD_STB: '${LIBTCOD_STB}'")
diff --git a/ports/libtcod/vcpkg.json b/ports/libtcod/vcpkg.json
index 8af4572e93..29c5e4036d 100644
--- a/ports/libtcod/vcpkg.json
+++ b/ports/libtcod/vcpkg.json
@@ -1,10 +1,12 @@
 {
   "name": "libtcod",
   "version": "1.20.1",
+  "port-version": 1,
   "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>",
   "description": "Common algorithms and tools for roguelikes.",
   "homepage": "https://github.com/libtcod/libtcod",
   "documentation": "https://libtcod.readthedocs.io/en/latest/",
+  "license": "BSD-3-Clause",
   "dependencies": [
     "glad",
     "lodepng-c",
diff --git a/ports/mnn/use-package-and-install.patch b/ports/mnn/use-package-and-install.patch
index dce33c8ede..be5329111b 100644
--- a/ports/mnn/use-package-and-install.patch
+++ b/ports/mnn/use-package-and-install.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 993f15d..53f24ae 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -270,18 +270,24 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "^Linux")
@@ -11,7 +9,7 @@ index 993f15d..53f24ae 100644
 +  find_package(OpenCL REQUIRED)
 +endif()
 +find_package(RapidJSON CONFIG REQUIRED)
-+find_path(STB_INCLUDE_DIRS "stb.h")
++find_path(STB_INCLUDE_DIRS stb_image.h)
 +find_package(Flatbuffers CONFIG REQUIRED)
  include_directories(${CMAKE_CURRENT_LIST_DIR}/include/
                      ${CMAKE_CURRENT_LIST_DIR}/source/
diff --git a/ports/mnn/vcpkg.json b/ports/mnn/vcpkg.json
index 0b21ba2f4a..d23de738ea 100644
--- a/ports/mnn/vcpkg.json
+++ b/ports/mnn/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mnn",
   "version": "1.1.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "MNN is a blazing fast, lightweight deep learning framework, battle-tested by business-critical use cases in Alibaba",
   "homepage": "https://www.mnn.zone/",
   "license": "Apache-2.0",
diff --git a/ports/sfml/stb_include.patch b/ports/sfml/stb_include.patch
index 3519b1c1e6..0ead09af52 100644
--- a/ports/sfml/stb_include.patch
+++ b/ports/sfml/stb_include.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e821a49bc..c68264ef2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -188,6 +188,9 @@ if(SFML_USE_SYSTEM_DEPS)
@@ -7,8 +5,8 @@ index e821a49bc..c68264ef2 100644
  
      list(REMOVE_DUPLICATES CMAKE_IGNORE_PATH)
 +
-+    find_path(STB_INCLUDE_DIR stb.h)
-+    include_directories(${STB_INCLUDE_DIR})
++    find_path(STB_INCLUDE_DIR stb_image.h)
++    include_directories("${STB_INCLUDE_DIR}")
  endif()
  
  # Visual C++: remove warnings regarding SL security and algorithms on pointers
diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json
index de544f640e..f700631de6 100644
--- a/ports/sfml/vcpkg.json
+++ b/ports/sfml/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "sfml",
   "version": "2.5.1",
-  "port-version": 12,
+  "port-version": 13,
   "description": "Simple and fast multimedia library",
   "homepage": "https://github.com/sfml/sfml",
+  "license": "Zlib",
   "dependencies": [
     "freetype",
     "libflac",
diff --git a/ports/stb/portfile.cmake b/ports/stb/portfile.cmake
index 922522f028..5f42687d3f 100644
--- a/ports/stb/portfile.cmake
+++ b/ports/stb/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nothings/stb
-    REF b42009b3b9d4ca35bc703f5310eedc74f584be58 # accessed on 2020-09-14
-    SHA512 a9ba80d19dae4e527171bb02e1caa4d3eb0704cdf7f8fef1a7a09e6b05c65b829b0aa580f469f158a39bf13018289f40c1680ab5c22bfa5e932bff94eced475d
+    REF af1a5bc352164740c1cc1354942b1c6b72eacb8a # committed on 2021-09-10
+    SHA512 5937baa1a9b7342ddc0e41c37ba0ea6b0c878f670a81b55bb124681e6b5e381fdc1d9557c96637e3ba082d6d968ed67a78b47f16aa5555c1c43394d1f9e57f2d
     HEAD_REF master
 )
 
diff --git a/ports/stb/vcpkg.json b/ports/stb/vcpkg.json
index 1b05b19b67..599b59f6ee 100644
--- a/ports/stb/vcpkg.json
+++ b/ports/stb/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "stb",
-  "version": "2020-09-14",
-  "port-version": 2,
+  "version-date": "2021-09-10",
   "description": "public domain header-only libraries",
   "homepage": "https://github.com/nothings/stb",
   "license": "MIT OR CC-PDDC"
diff --git a/versions/baseline.json b/versions/baseline.json
index 2fcead7086..15c7037df9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4074,7 +4074,7 @@
     },
     "libtcod": {
       "baseline": "1.20.1",
-      "port-version": 0
+      "port-version": 1
     },
     "libtess2": {
       "baseline": "2021-12-27",
@@ -4582,7 +4582,7 @@
     },
     "mnn": {
       "baseline": "1.1.0",
-      "port-version": 2
+      "port-version": 3
     },
     "modp-base64": {
       "baseline": "2020-09-26",
@@ -6470,7 +6470,7 @@
     },
     "sfml": {
       "baseline": "2.5.1",
-      "port-version": 12
+      "port-version": 13
     },
     "sfsexp": {
       "baseline": "1.3.1",
@@ -6793,8 +6793,8 @@
       "port-version": 1
     },
     "stb": {
-      "baseline": "2020-09-14",
-      "port-version": 2
+      "baseline": "2021-09-10",
+      "port-version": 0
     },
     "stftpitchshift": {
       "baseline": "1.4.1",
diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json
index 4dcdd5289c..83b242ce74 100644
--- a/versions/l-/libtcod.json
+++ b/versions/l-/libtcod.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "34c13b63430589533e25be1fdec7afc8fbe68f6c",
+      "version": "1.20.1",
+      "port-version": 1
+    },
     {
       "git-tree": "ec66d469b71cab685daede349e5193d15ab866c7",
       "version": "1.20.1",
diff --git a/versions/m-/mnn.json b/versions/m-/mnn.json
index af46b0080e..6f5141ac9b 100644
--- a/versions/m-/mnn.json
+++ b/versions/m-/mnn.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7f76a851632ab292ad4fbabcf5b6e94c0c6d957b",
+      "version": "1.1.0",
+      "port-version": 3
+    },
     {
       "git-tree": "e77125ae365a54bdcbbdb5bb2d77d32834a4487b",
       "version": "1.1.0",
diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json
index d9360682b0..3519276cfd 100644
--- a/versions/s-/sfml.json
+++ b/versions/s-/sfml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ca14334e4fdf097424958412912356dc2c186b9d",
+      "version": "2.5.1",
+      "port-version": 13
+    },
     {
       "git-tree": "bc9b03c639a91f2deff1fb78ab943cce64876ffe",
       "version": "2.5.1",
diff --git a/versions/s-/stb.json b/versions/s-/stb.json
index 7686352928..1068c6d4ab 100644
--- a/versions/s-/stb.json
+++ b/versions/s-/stb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2da639ecba7048e0f722dc01fae6cef32d671991",
+      "version-date": "2021-09-10",
+      "port-version": 0
+    },
     {
       "git-tree": "41ce7d73e93526a943f08e5e4601c6b2325ba527",
       "version": "2020-09-14",