diff --git a/security/monkeysphere/Makefile b/security/monkeysphere/Makefile
index d29270964a4c..156be1f05700 100644
--- a/security/monkeysphere/Makefile
+++ b/security/monkeysphere/Makefile
@@ -1,65 +1,62 @@
 # Created by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 
 PORTNAME=	monkeysphere
 PORTVERSION=	0.42
 CATEGORIES=	security
-MASTER_SITES=	http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/
-DISTFILES=	${PORTNAME}_${DISTVERSION}.orig${EXTRACT_SUFX}
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Use the OpenPGP web of trust to verify ssh connections
 
 LICENSE=	GPLv3
 
-BROKEN=		Unfetchable
-DEPRECATED=	Abandonware, dead upstream
-EXPIRATION_DATE=2022-03-31
-
 LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error
 RUN_DEPENDS=	gpg2:security/gnupg \
 		lockfile:mail/procmail \
 		bash:shells/bash \
 		p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
 		p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 
 USES=		gmake shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	dkg
+GH_TAGNAME=	${PORTNAME}_${PORTVERSION}
 
 SHEBANG_FILES=	src/share/checkperms src/transitions/0.23 \
 		src/transitions/0.28 src/share/keytrans
 
 USERS=	monkeysphere
 GROUPS=	monkeysphere
 
 MAKE_ARGS+=	ETCPREFIX=${PREFIX} MANPREFIX=${PREFIX}/man ETCSUFFIX=.sample
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -i '' 's|/etc/monkeysphere|${PREFIX}/etc/monkeysphere|g' \
 	  ${WRKSRC}/src/share/defaultenv \
 	  ${WRKSRC}/src/transitions/0.23 \
 	  ${WRKSRC}/man/man1/monkeysphere.1 \
 	  ${WRKSRC}/man/man8/monkeysphere-authentication.8 \
 	  ${WRKSRC}/man/man8/monkeysphere-host.8 \
 	  ${WRKSRC}/etc/monkeysphere-authentication.conf
 	@${REINPLACE_CMD} -i '' 's|/var/lib/monkeysphere|/var/monkeysphere|g' \
 	  ${WRKSRC}/src/transitions/0.23 \
 	  ${WRKSRC}/man/man1/monkeysphere.1 \
 	  ${WRKSRC}/man/man8/monkeysphere-authentication.8 \
 	  ${WRKSRC}/man/man8/monkeysphere-host.8 \
 	  ${WRKSRC}/src/monkeysphere-host \
 	  ${WRKSRC}/src/monkeysphere-authentication
 	@${REINPLACE_CMD} -i '' 's|/usr/share/monkeysphere|${PREFIX}/share/monkeysphere|g' \
 	  ${WRKSRC}/src/monkeysphere-host \
 	  ${WRKSRC}/src/monkeysphere-authentication \
 	  ${WRKSRC}/src/monkeysphere
 	# and clean up cruft from any patches or sed replacements:
 	${FIND} ${WRKSRC} \( -name \*.bak -o -name \*.orig \) -delete
 	@${REINPLACE_CMD} 's|gcc|${CC}|g' ${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/agent-transfer
 
 .include <bsd.port.mk>
diff --git a/security/monkeysphere/distinfo b/security/monkeysphere/distinfo
index 90ed17f68b78..ac36986c9689 100644
--- a/security/monkeysphere/distinfo
+++ b/security/monkeysphere/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547723173
-SHA256 (monkeysphere_0.42.orig.tar.gz) = c1c956b1c86aaa44134fc1a9d75f5aef61266e3a9d8a6218b45d6c54bb7c58c1
-SIZE (monkeysphere_0.42.orig.tar.gz) = 110415
+TIMESTAMP = 1645881389
+SHA256 (dkg-monkeysphere-0.42-monkeysphere_0.42_GH0.tar.gz) = 8190047383a91c17301be8063f59b9f9c07b349853f865ce0f6d199094cfe90d
+SIZE (dkg-monkeysphere-0.42-monkeysphere_0.42_GH0.tar.gz) = 110434