diff --git a/security/py-pyhanko/Makefile b/security/py-pyhanko/Makefile
index 8c04a1fd0503..b333a2268cc0 100644
--- a/security/py-pyhanko/Makefile
+++ b/security/py-pyhanko/Makefile
@@ -1,44 +1,52 @@
 PORTNAME=	pyhanko
-PORTVERSION=	0.17.2
-PORTREVISION=	3
+PORTVERSION=	0.19.0
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyHanko-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Tools for stamping and signing PDF files
 WWW=		https://github.com/MatthiasValvekens/pyHanko
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1crypto>=1.5.1:devel/py-asn1crypto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7.1.2:devel/py-click@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}cryptography>=3.3.1:security/py-cryptography@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyhanko-certvalidator>=0.20<0.21:security/py-pyhanko-certvalidator@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1,1:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=3.3.1,1:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyhanko-certvalidator>=0.23<0.24:security/py-pyhanko-certvalidator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qrcode>=6.1:textproc/py-qrcode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.24.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>=2.1:devel/py-tzlocal@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}tzlocal>=4.3:devel/py-tzlocal@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	IMAGE_SUPPORT OPENTYPE PKGCS11 XMP
 IMAGE_SUPPORT_DESC=	Image handling support
 OPENTYPE_DESC=	OpenType/TrueType support
 PKGCS11_DESC=	PKGCS\#11 support
 XMP_DESC=	XMP (Extensible Metadata Platform) support
 
 IMAGE_SUPPORT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=7.2.0:graphics/py-pillow@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}python-barcode>=0.14.0<0.14.0_99:graphics/py-python-barcode@${PY_FLAVOR}
 OPENTYPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fonttools>=4.33.3:print/py-fonttools@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}uharfbuzz>=0.25.0:print/py-uharfbuzz@${PY_FLAVOR}
 PKGCS11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-pkcs11>=0.7.0<0.8:security/py-python-pkcs11@${PY_FLAVOR}
 XMP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>=0.7.1<0.8:devel/py-defusedxml@${PY_FLAVOR}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 30900
+# tzdata is from backports.zoneinfo[tzdata]
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.zoneinfo>=0:devel/py-backports.zoneinfo@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tzdata>=0:devel/py-tzdata@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/security/py-pyhanko/distinfo b/security/py-pyhanko/distinfo
index 3f23f90dd60d..93d36721d962 100644
--- a/security/py-pyhanko/distinfo
+++ b/security/py-pyhanko/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1681052896
-SHA256 (pyHanko-0.17.2.tar.gz) = b1f027f0f63a0c9f6c457652c8d1f5c959e6569ec79cdcdbee19cf8f9f2ad423
-SIZE (pyHanko-0.17.2.tar.gz) = 334201
+TIMESTAMP = 1688166316
+SHA256 (pyHanko-0.19.0.tar.gz) = 9cca53a633784bf7ad9ba41f2d7a8abdafca722b9f23f02add9d4150e316d6db
+SIZE (pyHanko-0.19.0.tar.gz) = 352897
diff --git a/security/py-pyhanko/files/patch-pyproject.toml b/security/py-pyhanko/files/patch-pyproject.toml
new file mode 100644
index 000000000000..29b84877b1e3
--- /dev/null
+++ b/security/py-pyhanko/files/patch-pyproject.toml
@@ -0,0 +1,27 @@
+--- pyproject.toml.orig	2023-06-18 16:39:33 UTC
++++ pyproject.toml
+@@ -1,12 +1,12 @@
+ [build-system]
+ requires = [
+-    "setuptools>=67.4",
+-    "wheel", "pytest-runner",
++    "setuptools>=61",
++    "wheel",
+ ]
+ build-backend = "setuptools.build_meta"
+ 
+ [project]
+-name = "pyHanko"
++name = "pyhanko"
+ description = "Tools for stamping and signing PDF files"
+ authors = [{name = "Matthias Valvekens", email = "dev@mvalvekens.be"}]
+ maintainers = [{name = "Matthias Valvekens", email = "dev@mvalvekens.be"}]
+@@ -64,7 +64,7 @@ opentype = [
+     "fonttools>=4.33.3",
+     # uharfbuzz sometimes includes breaking changes, so
+     # we set an explicit range
+-    "uharfbuzz>=0.25.0,<0.36.0",
++    "uharfbuzz>=0.25.0",
+ ]
+ image-support = [
+     # Only tested systematically on 8.x,
diff --git a/security/py-pyhanko/files/patch-setup.py b/security/py-pyhanko/files/patch-setup.py
deleted file mode 100644
index 58679c0bc236..000000000000
--- a/security/py-pyhanko/files/patch-setup.py
+++ /dev/null
@@ -1,19 +0,0 @@
---- setup.py.orig	2023-03-09 22:50:58 UTC
-+++ setup.py
-@@ -70,7 +70,6 @@ setup(
-         'cryptography>=3.3.1'
-     ],
-     setup_requires=[
--        'wheel', 'pytest-runner'
-     ],
-     extras_require={
-         'extra_pubkey_algs': ['oscrypto>=1.2.1'],
-@@ -79,7 +78,7 @@ setup(
-             'fonttools>=4.33.3',
-             # uharfbuzz sometimes includes breaking changes, so
-             # we set an explicit range
--            'uharfbuzz>=0.25.0,<0.31.0'
-+            'uharfbuzz>=0.25.0'
-         ],
-         'image-support': [
-             # Only tested systematically on 8.x,