diff --git a/graphics/graphite2/Makefile b/graphics/graphite2/Makefile
index 843c769121ca..7df0715698bc 100644
--- a/graphics/graphite2/Makefile
+++ b/graphics/graphite2/Makefile
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	graphite2
-PORTVERSION=	1.3.14
+DISTVERSION=	1.3.14
 CATEGORIES=	graphics print
+MASTER_SITES=	https://github.com/silnrsi/graphite/releases/download/${DISTVERSION}/
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Rendering capabilities for complex non-Roman writing systems
@@ -11,12 +12,12 @@ LICENSE=	GPLv2 LGPL21 MPL20
 LICENSE_COMB=	dual
 LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSE
 
-USES=		cmake compiler:c++11-lib
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fonttools3>0:print/py-fonttools3@${PY_FLAVOR}
+
+USES=		cmake compiler:c++11-lib python:test tar:tgz
 USE_LDCONFIG=	yes
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	silnrsi
-GH_PROJECT=	graphite
+TEST_TARGET=	test
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/pkgconfig|data&|' ${WRKSRC}/CMakeLists.txt
diff --git a/graphics/graphite2/distinfo b/graphics/graphite2/distinfo
index 2c67ee83e98d..1accbb1fa530 100644
--- a/graphics/graphite2/distinfo
+++ b/graphics/graphite2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585709593
-SHA256 (silnrsi-graphite-1.3.14_GH0.tar.gz) = 7a3b342c5681921ce2e0c2496509d30b5b078399d5a7bd2358f95166d57d91df
-SIZE (silnrsi-graphite-1.3.14_GH0.tar.gz) = 6629829
+TIMESTAMP = 1601274903
+SHA256 (graphite2-1.3.14.tgz) = f99d1c13aa5fa296898a181dff9b82fb25f6cc0933dbaa7a475d8109bd54209d
+SIZE (graphite2-1.3.14.tgz) = 6630061