diff --git a/textproc/py-TatSu/Makefile b/textproc/py-TatSu/Makefile
index 4459a3881db4..8d87d19dd107 100644
--- a/textproc/py-TatSu/Makefile
+++ b/textproc/py-TatSu/Makefile
@@ -1,36 +1,38 @@
-PORTNAME=	TatSu
-DISTVERSIONPREFIX=	v
-DISTVERSION=	5.15.1
+PORTNAME=	tatsu
+DISTVERSION=	5.24.0
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Generate Python parsers from grammars in a variation of EBNF
 WWW=		https://tatsu.readthedocs.io/en/stable/ \
 		https://github.com/neogeny/TatSu
 
 LICENSE=	BSD4CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 
-USES=		python:3.11+
+USES=		python shebangfix
 USE_PYTHON=	pep517 concurrent autoplist pytest
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	neogeny
+SHEBANG_FILES=	tatsu/g2e/__init__.py
 
-NO_ARCH=	yes
-
-POST_PLIST+=	fix-plist
+PYTEST_IGNORED_TESTS=	\
+		test_dot \
+		test_02_previous_output_generator test_03_repeat_02 test_04_repeat_03 \
+		test_05_parse_with_model test_06_generate_code test_08_compile_with_generated \
+		test_12_walker test_13_diagram \
+		test_cling_boot test_cling_grammar test_cling_grammar_json test_cling_help \
+		test_cli_help test_cli_model test_cli_python # disable failing tests, see https://github.com/neogeny/TatSu/issues/436
 
-post-install: # workaround https://github.com/neogeny/TatSu/issues/333
-	@${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/test
+# The upstream 'cling' console script collides with lang/cling; rename it.
+post-patch:
+	@${REINPLACE_CMD} -e 's|^cling = "tatsu.cling:cling_main"|tatsu-cling = "tatsu.cling:cling_main"|' ${WRKSRC}/pyproject.toml
 
-fix-plist:
-	${REINPLACE_CMD} -e 's|^.*/test/.*$$||' ${TMPPLIST}
+NO_ARCH=	yes
 
-# tests as of version 5.15.1: 142 passed, 2 skipped, 2 warnings in 10.17s
+# tests as of 5.24.0: 584 passed, 6 skipped, 16 deselected, 14 warnings in 33.47s (some tests fail on he first run due to missing files, but they succeed when run again, see https://github.com/neogeny/TatSu/issues/435)
 
 .include <bsd.port.mk>
diff --git a/textproc/py-TatSu/distinfo b/textproc/py-TatSu/distinfo
index e9b53bf8bc14..844fe8c73668 100644
--- a/textproc/py-TatSu/distinfo
+++ b/textproc/py-TatSu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1767595645
-SHA256 (neogeny-TatSu-v5.15.1_GH0.tar.gz) = f6bc53a9304d1a4e28e06264c1926aa801c03a9018115702545a1d833fda1322
-SIZE (neogeny-TatSu-v5.15.1_GH0.tar.gz) = 177292
+TIMESTAMP = 1788806966
+SHA256 (tatsu-5.24.0.tar.gz) = e79230f6b70d570b1314075ac1a0ca4088730955981ae5d0b6ab2f88a293117e
+SIZE (tatsu-5.24.0.tar.gz) = 390039