diff --git a/security/py-pyhanko/Makefile b/security/py-pyhanko/Makefile
index 79136dcd0e15..a8bab9d7c43c 100644
--- a/security/py-pyhanko/Makefile
+++ b/security/py-pyhanko/Makefile
@@ -1,51 +1,52 @@
 PORTNAME=	pyhanko
-PORTVERSION=	0.19.0
+PORTVERSION=	0.20.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
+WWW=		https://pyhanko.readthedocs.io/en/latest/ \
+		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}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>=4.3:devel/py-tzlocal@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}tzlocal>=4.2:devel/py-tzlocal@${PY_FLAVOR}
 
 USES=		pycryptography:run python
 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}
+			${PYTHON_PKGNAMEPREFIX}python-barcode>=0.15.1<0.15.1_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}
+			${PYTHON_PKGNAMEPREFIX}uharfbuzz>=0.25.0<0.38.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.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}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.zoneinfo>=0:devel/py-backports.zoneinfo@${PY_FLAVOR}
+# backports.zoneinfo[tzdata]
+RUN_DEPENDS+=	${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 93d36721d962..0593dc20647e 100644
--- a/security/py-pyhanko/distinfo
+++ b/security/py-pyhanko/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688166316
-SHA256 (pyHanko-0.19.0.tar.gz) = 9cca53a633784bf7ad9ba41f2d7a8abdafca722b9f23f02add9d4150e316d6db
-SIZE (pyHanko-0.19.0.tar.gz) = 352897
+TIMESTAMP = 1691070162
+SHA256 (pyHanko-0.20.0.tar.gz) = 2b693e20a3b06ef97dc3a375e9f99bf78db60cc3ce4bf4d05ad043f5df38d105
+SIZE (pyHanko-0.20.0.tar.gz) = 352986
diff --git a/security/py-pyhanko/files/patch-pyproject.toml b/security/py-pyhanko/files/patch-pyproject.toml
index 29b84877b1e3..c1d43c221b88 100644
--- a/security/py-pyhanko/files/patch-pyproject.toml
+++ b/security/py-pyhanko/files/patch-pyproject.toml
@@ -1,27 +1,27 @@
---- pyproject.toml.orig	2023-06-18 16:39:33 UTC
+--- pyproject.toml.orig	2023-07-28 20:37: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,
+@@ -36,7 +36,7 @@ requires-python = ">=3.7"
+ dependencies = [
+     "asn1crypto>=1.5.1",
+     "qrcode>=6.1",
+-    "tzlocal>=4.3",
++    "tzlocal>=4.2",
+     "pyhanko-certvalidator==0.23.*",
+     "click>=7.1.2",
+     "requests>=2.24.0",