diff --git a/print/py-fontbakery/Makefile b/print/py-fontbakery/Makefile
index 6a9cf6709fa7..accdd7b17e38 100644
--- a/print/py-fontbakery/Makefile
+++ b/print/py-fontbakery/Makefile
@@ -1,60 +1,59 @@
 PORTNAME=	fontbakery
-PORTVERSION=	0.8.11
-PORTREVISION=	1
+PORTVERSION=	0.8.12
 DISTVERSIONPREFIX=	v
 CATEGORIES=	print python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Well designed Font QA tool
 WWW=		https://github.com/googlefonts/fontbakery
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.2:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}axisregistry>=0.3.0:x11-fonts/py-axisregistry@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beziers>=0.5.0:graphics/py-beziers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cmarkgfm>=0:textproc/py-cmarkgfm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}collidoscope>=0.5.2:print/py-collidoscope@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}defcon>=0:x11-fonts/py-defcon@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dehinter>=3.1.0:print/py-dehinter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}font-v>=0:print/py-font-v@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fonttools>=4.36.0:print/py-fonttools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gflanguages>=0.3.0:x11-fonts/py-gflanguages@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}glyphsets>=0.5.0:print/py-glyphsets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opentype-sanitizer>=7.1.9:x11-fonts/py-opentype-sanitizer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opentypespec>=0:x11-fonts/py-opentypespec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip-api>=0:devel/py-pip-api@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.7.0,1:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=0:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stringbrewer>=0:devel/py-stringbrewer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ufolint>=0:x11-fonts/py-ufolint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unicodedata2>=0:devel/py-unicodedata2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vharfbuzz>=0.2.0:print/py-vharfbuzz@${PY_FLAVOR}
 
-USES=		python:3.7+
+USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 GH_ACCOUNT=	googlefonts
 USE_GITHUB=	yes
 
 OPTIONS_DEFINE=	FREETYPE
 
 FREETYPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}freetype-py>=0:print/py-freetype-py@${PY_FLAVOR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/print/py-fontbakery/distinfo b/print/py-fontbakery/distinfo
index 6845494c0e0e..8ba9acba9c09 100644
--- a/print/py-fontbakery/distinfo
+++ b/print/py-fontbakery/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1681588045
-SHA256 (googlefonts-fontbakery-v0.8.11_GH0.tar.gz) = c5c494c776cd195b76975b31f52684412fe22590fc013f226e08f24ad3d844be
-SIZE (googlefonts-fontbakery-v0.8.11_GH0.tar.gz) = 45017276
+TIMESTAMP = 1685792328
+SHA256 (googlefonts-fontbakery-v0.8.12_GH0.tar.gz) = b97b8b55ab9b8e1fef5ff563747b2c22e1468a7c6fe9c0fabfc9d4229cbd32bb
+SIZE (googlefonts-fontbakery-v0.8.12_GH0.tar.gz) = 46415744
diff --git a/print/py-fontbakery/files/patch-setup.py b/print/py-fontbakery/files/patch-setup.py
index a8901bafcb48..732de7d51b77 100644
--- a/print/py-fontbakery/files/patch-setup.py
+++ b/print/py-fontbakery/files/patch-setup.py
@@ -1,29 +1,20 @@
---- setup.py.orig	2023-03-03 17:20:04 UTC
+--- setup.py.orig	2023-06-01 00:42:56 UTC
 +++ setup.py
 @@ -23,7 +23,7 @@ except IOError:
  
  setup(
      name="fontbakery",
 -    use_scm_version={"write_to": "Lib/fontbakery/_version.py"},
 +    use_scm_version={"fallback_version": "%%PORTVERSION%%", "write_to": "Lib/fontbakery/_version.py"},
      url='https://github.com/googlefonts/fontbakery/',
      description='Well designed Font QA tool, written in Python 3',
      long_description=readme,
-@@ -66,7 +66,7 @@ setup(
-         'beautifulsoup4',
-         'beziers>=0.5.0', # Uses new fontTools glyph outline access
-         'cmarkgfm',
--        'collidoscope==0.4.1', # 0.4.0 had a bug that failed to detect
-+        'collidoscope>=0.5.2', # 0.4.0 had a bug that failed to detect
-                                # an ïï collision on Nunito Black.
-                                # (see https://github.com/googlefonts/fontbakery/issues/3554)
-         'defcon',
-@@ -84,7 +84,7 @@ setup(
+@@ -83,7 +83,7 @@ setup(
          'pip-api',    # needed for checking Font Bakery's version
          # 3.7.0 fixed a bug on parsing some METADATA.pb files.
          # We cannot use v4 because our protobuf files have been compiled with v3.
 -        'protobuf>=3.7.0, <4',  
 +        'protobuf>=3.7.0',  
                              # (see https://github.com/googlefonts/fontbakery/issues/2200)
          'PyYAML',
          'requests',