diff --git a/ports/harfbuzz/fix-win32-build.patch b/ports/harfbuzz/fix-win32-build.patch
new file mode 100644
index 0000000000..f8551e3aff
--- /dev/null
+++ b/ports/harfbuzz/fix-win32-build.patch
@@ -0,0 +1,26 @@
+diff --git a/src/meson.build b/src/meson.build
+index 87e8962..bdfa797 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -387,6 +387,11 @@ hb_subset_sources = files(
+   'hb-subset.hh',
+ )
+ 
++extra_hb_cpp_args = []
++if cpp.get_argument_syntax() == 'msvc'
++  extra_hb_cpp_args += ['/bigobj']
++endif
++
+ hb_subset_headers = files(
+   'hb-subset.h',
+   'hb-subset-repacker.h'
+@@ -559,8 +564,7 @@ defs_list = [harfbuzz_def]
+ 
+ version = '0.@0@.0'.format(hb_version_int)
+ 
+-extra_hb_cpp_args = []
+-if cpp.get_define('_MSC_FULL_VER') != ''
++if cpp.get_argument_syntax() == 'msvc'
+   if get_option('default_library') != 'static'
+     extra_hb_cpp_args += '-DHB_DLL_EXPORT'
+   endif
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index fbdbc60871..650c43841d 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF ${VERSION}
     SHA512 23d6abbd270885d7ae1ebb3c981f0c331a48d891e23caffe9e254f5e7e205bb0348add7b371526166a49b336f8076f92c11ef76ca81f48a6fd9f58812ec96d79
     HEAD_REF master
+    PATCHES
+        fix-win32-build.patch
 )
 
 if("icu" IN_LIST FEATURES)
diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json
index ffd73c02a5..5f08cadde5 100644
--- a/ports/harfbuzz/vcpkg.json
+++ b/ports/harfbuzz/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "harfbuzz",
   "version": "8.2.1",
+  "port-version": 1,
   "description": "HarfBuzz OpenType text shaping engine",
   "homepage": "https://github.com/harfbuzz/harfbuzz",
   "license": "MIT-Modern-Variant",
diff --git a/versions/baseline.json b/versions/baseline.json
index ffe701bc2a..8b6eb6a266 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3190,7 +3190,7 @@
     },
     "harfbuzz": {
       "baseline": "8.2.1",
-      "port-version": 0
+      "port-version": 1
     },
     "hash-library": {
       "baseline": "8",
diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json
index 2a9dc54368..373057f27d 100644
--- a/versions/h-/harfbuzz.json
+++ b/versions/h-/harfbuzz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1f39a3081e7055cbf5e8cc27b5f91fef2a274415",
+      "version": "8.2.1",
+      "port-version": 1
+    },
     {
       "git-tree": "6894af0b171aea403718ebb131b454a60b0c961a",
       "version": "8.2.1",