diff --git a/devel/py-mdv/Makefile b/devel/py-mdv/Makefile
index 726daae38ca6..b4446e8ef629 100644
--- a/devel/py-mdv/Makefile
+++ b/devel/py-mdv/Makefile
@@ -1,33 +1,32 @@
 PORTNAME=	mdv
 PORTVERSION=	1.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Terminal markdown viewer
 WWW=		https://pypi.org/project/mdv/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.6+
+USE_GITHUB=	yes
+GH_ACCOUNT=	axiros
+GH_PROJECT=	terminal_markdown_viewer
+GH_TAGNAME=	435b688
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.if ${FLAVOR:Upy36:Mpy3*}
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-setup.py
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/py-mdv/distinfo b/devel/py-mdv/distinfo
index 56f0453b9b1a..f4fb5257fbcc 100644
--- a/devel/py-mdv/distinfo
+++ b/devel/py-mdv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555050180
-SHA256 (mdv-1.7.4.tar.gz) = 1534f477c85d580352c82141436f6fdba79d329af8a5ee7e329fea14424a660d
-SIZE (mdv-1.7.4.tar.gz) = 54426
+TIMESTAMP = 1665762671
+SHA256 (axiros-terminal_markdown_viewer-1.7.4-435b688_GH0.tar.gz) = 09d21c4efc755e06f3961f074533908f4b992a99c23314bccab8435a33ef32a3
+SIZE (axiros-terminal_markdown_viewer-1.7.4-435b688_GH0.tar.gz) = 1563595
diff --git a/devel/py-mdv/files/extra-patch-setup.py b/devel/py-mdv/files/extra-patch-setup.py
deleted file mode 100644
index 18b9bafbf01b..000000000000
--- a/devel/py-mdv/files/extra-patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2019-04-12 06:50:54 UTC
-+++ setup.py
-@@ -16,7 +16,7 @@ from setuptools import setup, find_packages
- 
- version = "1.7.4"
- 
--with open(os.path.join(os.path.dirname(__file__), "README.md")) as fd:
-+with open(os.path.join(os.path.dirname(__file__), "README.md"), encoding='utf-8') as fd:
-     md = fd.read()
- 
- # images hack for pypi: