diff --git a/devel/py-hgtools/Makefile b/devel/py-hgtools/Makefile
index e355e6077002..ac27235836af 100644
--- a/devel/py-hgtools/Makefile
+++ b/devel/py-hgtools/Makefile
@@ -1,19 +1,25 @@
 PORTNAME=	hgtools
-PORTVERSION=	6.3
-PORTREVISION=	1
+DISTVERSION=	6.4
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Classes and setuptools plugin for Mercurial repositories
 WWW=		https://github.com/jaraco/hgtools
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python zip
-USE_PYTHON=	distutils autoplist
+DEPRECATED=		Deprecated by upstream
+EXPIRATION_DATE=	2026-09-30
+
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.9:devel/py-setuptools-scm@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-hgtools/distinfo b/devel/py-hgtools/distinfo
index b90c44beb192..d49855cb0e24 100644
--- a/devel/py-hgtools/distinfo
+++ b/devel/py-hgtools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463831578
-SHA256 (hgtools-6.3.zip) = 1d0ef6ceaba1673e6923b17d7f09c5ae2f4394d16ef80562812987a27e7836ff
-SIZE (hgtools-6.3.zip) = 39805
+TIMESTAMP = 1783277622
+SHA256 (hgtools-6.4.tar.gz) = dfc31f2926dcc10dfbc22278daf63682d0e7eec8e26f50b28c5f156daa05a37e
+SIZE (hgtools-6.4.tar.gz) = 22288