diff --git a/print/py-uharfbuzz/Makefile b/print/py-uharfbuzz/Makefile
index 90cac49a83c1..f255b84c2113 100644
--- a/print/py-uharfbuzz/Makefile
+++ b/print/py-uharfbuzz/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	uharfbuzz
 PORTVERSION=	0.30.0
 CATEGORIES=	print python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Streamlined Cython bindings for the harfbuzz shaping engine
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS=	harfbuzz>=5.1.0:print/harfbuzz \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 
 USES=		compiler:c++11-lang python:3.6+ zip
 USE_PYTHON=	autoplist concurrent cython distutils
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/setup.py ${WRKSRC}/src/uharfbuzz/_harfbuzz.cpp
 	@${RM} ${WRKSRC}/src/uharfbuzz/_harfbuzz.cpp
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/harfbuzz/
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/print/py-uharfbuzz/files/patch-src-uharfbuzz-_harfbuzz.cpp b/print/py-uharfbuzz/files/patch-src-uharfbuzz-_harfbuzz.cpp
index f60669a0747f..133d69461964 100644
--- a/print/py-uharfbuzz/files/patch-src-uharfbuzz-_harfbuzz.cpp
+++ b/print/py-uharfbuzz/files/patch-src-uharfbuzz-_harfbuzz.cpp
@@ -1,12 +1,19 @@
---- src/uharfbuzz/_harfbuzz.cpp.orig	2022-07-31 12:40:22 UTC
+--- src/uharfbuzz/_harfbuzz.cpp.orig	2022-07-31 07:40:22 UTC
 +++ src/uharfbuzz/_harfbuzz.cpp
-@@ -36,9 +36,6 @@
+@@ -30,15 +30,12 @@
+             "-std=c++11"
+         ],
+         "include_dirs": [
+-            "harfbuzz/src"
++            "%%LOCALBASE%%/include/harfbuzz"
+         ],
+         "language": "c++",
          "name": "uharfbuzz._harfbuzz",
          "sources": [
              "src/uharfbuzz/_harfbuzz.pyx",
 -            "harfbuzz/src/harfbuzz.cc",
 -            "harfbuzz/src/hb-subset-repacker.cc",
 -            "harfbuzz/src/graph/gsubgpos-context.cc",
              "src/uharfbuzz/_draw_test_funcs.cc"
          ]
      },