diff --git a/net-mgmt/zenpack-checkping/Makefile b/net-mgmt/zenpack-checkping/Makefile
index 9ab21d44e485..f7216e7ea3b9 100644
--- a/net-mgmt/zenpack-checkping/Makefile
+++ b/net-mgmt/zenpack-checkping/Makefile
@@ -8,16 +8,16 @@
 PORTNAME=	CheckPing
 PORTVERSION=	1.0
 CATEGORIES=	net-mgmt www
-MASTER_SITES=	http://zenpacks.zenoss.org/trac-zenpacks/changeset/1002/tags/
-DISTFILES=	nagios-check-ping-${PORTVERSION}?old_path=%2F\&format=zip
+MASTER_SITES=	https://github.com/zenoss/${ZPACKPREFIX}${PORTNAME}/tarball/master/
+DISTFILES=	zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
 
 MAINTAINER=	zenoss@experts-exchange.com
 COMMENT=	Provides nagios ping check for Zenoss monitoring
 
-USE_ZIP=	yes
 ZPACKPREFIX=	ZenPacks.Nagios.
 ZPACKGROUP=	community
-WRKSRC=	${WRKDIR}/tags/nagios-check-ping-${PORTVERSION}/
+WRKSRC=	${WRKDIR}/zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
+TAG=            0088e17
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/Mk/bsd.zenoss.mk"
diff --git a/net-mgmt/zenpack-checkping/distinfo b/net-mgmt/zenpack-checkping/distinfo
index efd8a8b21ee7..52ddcf2be484 100644
--- a/net-mgmt/zenpack-checkping/distinfo
+++ b/net-mgmt/zenpack-checkping/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nagios-check-ping-1.0?old_path=%2F&format=zip) = 1f605381289046b2a2ac0491c908f7804b1d207f9c08bf6db523b934621c4398
-SIZE (nagios-check-ping-1.0?old_path=%2F&format=zip) = 4583
+SHA256 (zenoss-ZenPacks.Nagios.CheckPing-0088e17) = 7259eaefd00c8af389411709d46ecf4f95d89f33a8f9f8fce5d777e8b728034c
+SIZE (zenoss-ZenPacks.Nagios.CheckPing-0088e17) = 3524