diff --git a/math/ntpoly/Makefile b/math/ntpoly/Makefile
index edc58425933c..f0498f131880 100644
--- a/math/ntpoly/Makefile
+++ b/math/ntpoly/Makefile
@@ -1,37 +1,36 @@
-PORTNAME=	NTPoly
-PORTVERSION=	2.7.1
-DISTVERSIONPREFIX=	v
+PORTNAME=	ntpoly
+DISTVERSION=	2.7.1
 CATEGORIES=	math
-MASTER_SITES=	https://github.com/william-dawson/${PORTNAME}/archive/refs/tags/
-DISTNAME=	${PORTNAME:tl}-${DISTVERSIONPREFIX}${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Library for computing the functions of sparse matrices
-WWW=		https://github.com/kimwalisch/primecount
+WWW=		https://william-dawson.github.io/NTPoly
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	swig>0:devel/swig
-TEST_DEPENDS=	${PYNUMPY}	\
-		bash:shells/bash	\
-		${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}	\
+TEST_DEPENDS=	${PYNUMPY} \
+		bash:shells/bash \
+		${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
-#USE_GITHUB=	yes
-#GH_ACCOUNT=	william-dawson
-
 USES=		blaslapack:openblas cmake fortran mpi python
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME:tl}-${DISTVERSIONPREFIX}${DISTVERSION}
+USE_GITHUB=	yes
+USE_LDCONFIG=	yes
+
+GH_ACCOUNT=	william-dawson
+GH_PROJECT=	NTPoly
+GH_TAGNAME=	${PORTNAME}-v${DISTVERSION}
+
 FFLAGS+=	-fopenmp -fallow-argument-mismatch
 CXXFLAGS+=	-fopenmp
-CMAKE_ARGS=	-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
-CMAKE_ON=	BUILD_SHARED_LIBS
-USE_LDCONFIG=	yes
 
 TOOLCHAIN=	${WRKSRC}/Targets/${OPSYS}.cmake
+NTPLIBS=	${GH_PROJECT} ${GH_PROJECT}CPP ${GH_PROJECT}Wrapper
 
-NTPLIBS=	${PORTNAME} ${PORTNAME}CPP ${PORTNAME}Wrapper
+CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_ARGS=	-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
 
 pre-configure:
 	${ECHO_CMD} 'set(CMAKE_SYSTEM_NAME ${OPSYS})' > ${TOOLCHAIN}
diff --git a/math/ntpoly/distinfo b/math/ntpoly/distinfo
index ff65e443cf0b..e690e26b6052 100644
--- a/math/ntpoly/distinfo
+++ b/math/ntpoly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665940022
-SHA256 (ntpoly-v2.7.1.tar.gz) = c15d9f51ac054b4ef0565ce5c4c8589c10bdbab4dc3442ebd109691e2bbfc7e2
-SIZE (ntpoly-v2.7.1.tar.gz) = 281935
+TIMESTAMP = 1666032744
+SHA256 (william-dawson-NTPoly-2.7.1-ntpoly-v2.7.1_GH0.tar.gz) = c15d9f51ac054b4ef0565ce5c4c8589c10bdbab4dc3442ebd109691e2bbfc7e2
+SIZE (william-dawson-NTPoly-2.7.1-ntpoly-v2.7.1_GH0.tar.gz) = 281935