diff --git a/devel/py-flufl.i18n/Makefile b/devel/py-flufl.i18n/Makefile
index 677888f066d8..1142f6d62c8f 100644
--- a/devel/py-flufl.i18n/Makefile
+++ b/devel/py-flufl.i18n/Makefile
@@ -1,21 +1,24 @@
 PORTNAME=	flufl.i18n
-PORTVERSION=	4.1
+DISTVERSION=	6.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME:tl:C|[-_.]+|_|g}-${DISTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	High-level API for Python internationalization
 WWW=		https://flufli18n.readthedocs.io
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pdm-pep517>0:devel/py-pdm-pep517@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}diff-cover>=0:devel/py-diff-cover@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sybil>=0:devel/py-sybil@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist pep517
+USE_PYTHON=	autoplist pep517 pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-flufl.i18n/distinfo b/devel/py-flufl.i18n/distinfo
index 32c475b9cdb2..855c3e18fef0 100644
--- a/devel/py-flufl.i18n/distinfo
+++ b/devel/py-flufl.i18n/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734813003
-SHA256 (flufl.i18n-4.1.tar.gz) = 79f109e6b25747b2f42f28759685c2e21d9c8867d7089183ea22b242e12987e1
-SIZE (flufl.i18n-4.1.tar.gz) = 21514
+TIMESTAMP = 1773344214
+SHA256 (flufl_i18n-6.0.0.tar.gz) = 84f2076c1ff85cea1c8b8f5c66e8c41e5d61834d923cb3e6df4392a3b237a12d
+SIZE (flufl_i18n-6.0.0.tar.gz) = 21623
diff --git a/devel/py-flufl.i18n/files/patch-pyproject.toml b/devel/py-flufl.i18n/files/patch-pyproject.toml
new file mode 100644
index 000000000000..bd17e88eca82
--- /dev/null
+++ b/devel/py-flufl.i18n/files/patch-pyproject.toml
@@ -0,0 +1,14 @@
+remove after setuptools/python.mk update incorporating the period (.) portion of name normalisation
+
+https://packaging.python.org/en/latest/specifications/name-normalization/
+https://packaging.python.org/en/latest/specifications/binary-distribution-format/#escaping-and-unicode
+
+--- pyproject.toml.orig	2020-02-02 00:00:00 UTC
++++ pyproject.toml
+@@ -1,5 +1,5 @@
+ [project]
+-name = 'flufl.i18n'
++name = 'flufl-i18n'
+ authors = [
+     {name = 'Barry Warsaw', email = 'barry@python.org'},
+ ]