diff --git a/textproc/py-normality/Makefile b/textproc/py-normality/Makefile
index 1dcce2e366c8..7e0af66eded0 100644
--- a/textproc/py-normality/Makefile
+++ b/textproc/py-normality/Makefile
@@ -1,32 +1,26 @@
 PORTNAME=	normality
-DISTVERSION=	2.5.0
+DISTVERSION=	3.1.0
 CATEGORIES=	textproc python
-MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Micro-library to normalize text strings
 WWW=		https://github.com/pudo/normality
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS} \
-		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4.3:devel/py-setuptools-scm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}banal>=1.0.1:devel/py-banal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}text-unidecode>=0:converters/py-text-unidecode@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2.0.0:textproc/py-charset-normalizer@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2.0.0:textproc/py-charset-normalizer@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyicu>=2.10.0:devel/py-pyicu@${PY_FLAVOR}
 
 USES=		python
+USE_GITHUB=	yes
+GH_ACCOUNT=	pudo
 USE_PYTHON=	autoplist pep517 pytest
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=		ICU
-OPTIONS_DEFAULT=	ICU
-
-ICU_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyicu>=1.9.3:devel/py-pyicu@${PY_FLAVOR}
-
 .include <bsd.port.mk>
diff --git a/textproc/py-normality/distinfo b/textproc/py-normality/distinfo
index f0c1f9913964..0355c7a4166a 100644
--- a/textproc/py-normality/distinfo
+++ b/textproc/py-normality/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1696752372
-SHA256 (normality-2.5.0.tar.gz) = a55133e972b81c4a3bf8b6dc419f262f94a4fd6f636297046f74d35c93abe153
-SIZE (normality-2.5.0.tar.gz) = 17873
+TIMESTAMP = 1787145397
+SHA256 (pudo-normality-3.1.0_GH0.tar.gz) = 9d2d3705ec5458b36986d5a0ec32b07f4805780c74700c6fd6cb998017d1091f
+SIZE (pudo-normality-3.1.0_GH0.tar.gz) = 18442