diff --git a/mail/nmh-devel/Makefile b/mail/nmh-devel/Makefile
index 5cac12a0b5a2..36e273fbb39c 100644
--- a/mail/nmh-devel/Makefile
+++ b/mail/nmh-devel/Makefile
@@ -3,18 +3,19 @@
 PORTNAME=	nmh
 PORTVERSION=	${NMH_COMMIT_DATE}
 PORTREVISION=	2
+MASTER_SITES=	#
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${NMH_COMMIT_DATE}-${GIT_TAGNAME}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Cleaned up MH mailer suite
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	cschuber
-GH_PROJECT=	nmh
-GH_TAGNAME=	9159514406
+GIT_TAGNAME=	9159514
 NMH_COMMIT_DATE=	2022.02.04
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${GIT_TAGNAME}
+
 LICENSE=	BSD3CLAUSE
 
 USES=		autoreconf:build cpe gmake iconv ncurses readline shebangfix
@@ -102,6 +103,13 @@ DEBUG_FLAGS+=	-O0 -Wall -Wextra -g
 
 CONFLICTS_INSTALL=	ali ja-mh pixie p5-Dist-Joseki nmh-1.*
 
+do-fetch:
+	@cd ${DISTDIR} && \
+	if [ ! -f ${DISTNAME}${EXTRACT_SUFX} ]; then \
+		fetch -o ${DISTNAME}${EXTRACT_SUFX} \
+		    "https://git.savannah.gnu.org/gitweb/?p=nmh.git;a=snapshot;h=${GIT_TAGNAME};sf=tgz"; \
+	fi
+
 pre-configure:
 	cd ${WRKSRC} && ./autogen.sh
 
diff --git a/mail/nmh-devel/distinfo b/mail/nmh-devel/distinfo
index 6313ba98f9ee..a7a90d6f00cf 100644
--- a/mail/nmh-devel/distinfo
+++ b/mail/nmh-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644167468
-SHA256 (cschuber-nmh-2022.02.04-9159514406_GH0.tar.gz) = 193975dd7c25e5475bc23700a74031fca23163225fbd708720ee1d22b388efb0
-SIZE (cschuber-nmh-2022.02.04-9159514406_GH0.tar.gz) = 7997454
+TIMESTAMP = 1644206332
+SHA256 (nmh-devel-2022.02.04-9159514.tar.gz) = 78d46ace78be4156947100a0cd649813c649a40319c532cba3f4bf72b921d022
+SIZE (nmh-devel-2022.02.04-9159514.tar.gz) = 7997583