diff --git a/textproc/py-arabic-reshaper/Makefile b/textproc/py-arabic-reshaper/Makefile
index 487410089e70..e2c408a08586 100644
--- a/textproc/py-arabic-reshaper/Makefile
+++ b/textproc/py-arabic-reshaper/Makefile
@@ -3,9 +3,10 @@
 
 PORTNAME=	arabic-reshaper
 PORTVERSION=	2.1.1
-DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	arabic_reshaper-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Reconstruct Arabic sentences to be used in applications that do not support Arabic
@@ -20,8 +21,4 @@ USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-GH_ACCOUNT=	mpcabd
-GH_PROJECT=	python-arabic-reshaper
-USE_GITHUB=	yes
-
 .include <bsd.port.mk>
diff --git a/textproc/py-arabic-reshaper/distinfo b/textproc/py-arabic-reshaper/distinfo
index 0dc19bad5f76..1d1524365fce 100644
--- a/textproc/py-arabic-reshaper/distinfo
+++ b/textproc/py-arabic-reshaper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604680188
-SHA256 (mpcabd-python-arabic-reshaper-v2.1.1_GH0.tar.gz) = 2b09fe1e19f37b48a37f76be3c85f2201d2b80fe0b020189204e1ddf68843584
-SIZE (mpcabd-python-arabic-reshaper-v2.1.1_GH0.tar.gz) = 22202
+TIMESTAMP = 1610268863
+SHA256 (arabic_reshaper-2.1.1.tar.gz) = cf318fa5d51d2d224fa49bf6bdbbb4684f6bd2c068b75cfce0e607f89ac199dc
+SIZE (arabic_reshaper-2.1.1.tar.gz) = 18431