diff --git a/ports/bbalouki-itch/portfile.cmake b/ports/bbalouki-itch/portfile.cmake
index 992b7489d5..294d842063 100644
--- a/ports/bbalouki-itch/portfile.cmake
+++ b/ports/bbalouki-itch/portfile.cmake
@@ -1,4 +1,3 @@
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO bbalouki/itchcpp
diff --git a/ports/bbalouki-itch/usage b/ports/bbalouki-itch/usage
index 4e82d346fe..f27eb0232d 100644
--- a/ports/bbalouki-itch/usage
+++ b/ports/bbalouki-itch/usage
@@ -1,4 +1,4 @@
-itch provides CMake targets:
-
-find_package(itch CONFIG REQUIRED)
-target_link_libraries(main PRIVATE itch::itch)
+bbalouki-itch provides CMake targets:
+
+  find_package(itch CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE itch::itch)
diff --git a/ports/bbalouki-itch/vcpkg.json b/ports/bbalouki-itch/vcpkg.json
index 36430e12f5..cf4ba78e30 100644
--- a/ports/bbalouki-itch/vcpkg.json
+++ b/ports/bbalouki-itch/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "bbalouki-itch",
   "version": "1.0.0",
+  "port-version": 1,
   "maintainers": "Bertin Balouki SIMYELI",
   "description": "A High-Performance C++ library for parsing the ITCH 5.0 protocol.",
   "homepage": "https://github.com/bbalouki/itchcpp",
diff --git a/ports/libhat/libhat-config.cmake.in b/ports/libhat/libhat-config.cmake.in
index 5044656660..053d7b4331 100644
--- a/ports/libhat/libhat-config.cmake.in
+++ b/ports/libhat/libhat-config.cmake.in
@@ -1,3 +1,3 @@
-@PACKAGE_INIT@
-include("${CMAKE_CURRENT_LIST_DIR}/libhat-targets.cmake")
-check_required_components(libhat)
+@PACKAGE_INIT@
+include("${CMAKE_CURRENT_LIST_DIR}/libhat-targets.cmake")
+check_required_components(libhat)
diff --git a/ports/libhat/portfile.cmake b/ports/libhat/portfile.cmake
index 9ae6bb9957..d7157d9ae1 100644
--- a/ports/libhat/portfile.cmake
+++ b/ports/libhat/portfile.cmake
@@ -1,44 +1,42 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO BasedInc/libhat
-    REF "v${VERSION}"
-    SHA512 e2f3b06ea79436704b6f419370ca99e200d50c157f36492945006ce1b0bf5f7f924b601296babb3c2a6c0d50487c10551f7dfb5eeda51bd6c87044079be47db3
-    HEAD_REF master
-    PATCHES
-        0001-CMakeLists.patch
-        0002-fix-gcc.patch
-)
-
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/libhat-config.cmake.in" DESTINATION "${SOURCE_PATH}")
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic"   LIBHAT_BUILD_SHARED)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static"    LIBHAT_BUILD_STATIC)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        "hint"  LIBHAT_HINT_X86_64
-    INVERTED_FEATURES
-        "sse"    LIBHAT_DISABLE_SSE
-        "avx"    LIBHAT_DISABLE_AVX512
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        ${FEATURE_OPTIONS}
-        -DLIBHAT_SHARED_C_LIB=${LIBHAT_BUILD_SHARED}
-        -DLIBHAT_STATIC_C_LIB=${LIBHAT_BUILD_STATIC}
-        -DLIBHAT_TESTING=OFF
-        -DLIBHAT_TESTING_ASAN=OFF
-        -DLIBHAT_TESTING_SDE=OFF
-        -DLIBHAT_EXAMPLES=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup()
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO BasedInc/libhat
+    REF "v${VERSION}"
+    SHA512 e2f3b06ea79436704b6f419370ca99e200d50c157f36492945006ce1b0bf5f7f924b601296babb3c2a6c0d50487c10551f7dfb5eeda51bd6c87044079be47db3
+    HEAD_REF master
+    PATCHES
+        0001-CMakeLists.patch
+        0002-fix-gcc.patch
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/libhat-config.cmake.in" DESTINATION "${SOURCE_PATH}")
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic"   LIBHAT_BUILD_SHARED)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static"    LIBHAT_BUILD_STATIC)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        "hint"  LIBHAT_HINT_X86_64
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DLIBHAT_DISABLE_AVX512=ON # For AVX512, author an overlay-port that removes this line
+        -DLIBHAT_SHARED_C_LIB=${LIBHAT_BUILD_SHARED}
+        -DLIBHAT_STATIC_C_LIB=${LIBHAT_BUILD_STATIC}
+        -DLIBHAT_TESTING=OFF
+        -DLIBHAT_TESTING_ASAN=OFF
+        -DLIBHAT_TESTING_SDE=OFF
+        -DLIBHAT_EXAMPLES=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/libhat/vcpkg.json b/ports/libhat/vcpkg.json
index d5336e9e18..68d5a182a5 100644
--- a/ports/libhat/vcpkg.json
+++ b/ports/libhat/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libhat",
   "version": "0.7.0",
+  "port-version": 1,
   "description": "A high-performance, modern, C++20 library designed around game hacking.",
   "homepage": "https://github.com/BasedInc/libhat",
   "license": "MIT",
@@ -16,16 +17,8 @@
     }
   ],
   "features": {
-    "avx": {
-      "description": "Enables AVX512 scanning",
-      "supports": "!arm"
-    },
     "hint": {
       "description": "Enables support for the x86_64 scan hint, requires a small (2KB) data table"
-    },
-    "sse": {
-      "description": "Enables SSE scanning",
-      "supports": "!arm"
     }
   }
 }
diff --git a/versions/b-/bbalouki-itch.json b/versions/b-/bbalouki-itch.json
index 6ae016ac81..d3ecae2c7f 100644
--- a/versions/b-/bbalouki-itch.json
+++ b/versions/b-/bbalouki-itch.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "207ce7db4ba8f23e3aa43067f21ad2ea2de0ec95",
+      "version": "1.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e56f81d89614cec83d8e1368b6a3711b75eccfe6",
       "version": "1.0.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index f959b359bb..8fa31f8d30 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -630,7 +630,7 @@
     },
     "bbalouki-itch": {
       "baseline": "1.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "bcg729": {
       "baseline": "1.1.1",
@@ -4954,7 +4954,7 @@
     },
     "libhat": {
       "baseline": "0.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "libhdfs3": {
       "baseline": "2019-11-05",
diff --git a/versions/l-/libhat.json b/versions/l-/libhat.json
index e373c54447..5703c6edd8 100644
--- a/versions/l-/libhat.json
+++ b/versions/l-/libhat.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ef7c49ebd14b4dbc45ffe4ef6bfdbe882c87ca98",
+      "version": "0.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "64a62e75e0bd30a7f6d5674564b37a6585618666",
       "version": "0.7.0",