diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index 99c15aeefcaf..f2d0b83ffda2 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -2,12 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	pygopherd
-PORTVERSION=	2.0.16
-PORTREVISION=	3
+PORTVERSION=	2.0.18.4
 CATEGORIES=	net python
-MASTER_SITES=	http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/ \
-		http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/old/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+DISTVERSIONPREFIX=	debian/
 
 MAINTAINER=	neel@neelc.org
 COMMENT=	Multiprotocol Information Server
@@ -17,7 +14,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		python
 USE_PYTHON=	distutils
-WRKSRC=		${WRKDIR}/${PORTNAME}
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	jgoerzen
 
 NO_ARCH=	yes
 
diff --git a/net/pygopherd/distinfo b/net/pygopherd/distinfo
index 5085e5bc5b84..0f40a069d47f 100644
--- a/net/pygopherd/distinfo
+++ b/net/pygopherd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476825666
-SHA256 (pygopherd_2.0.16.tar.gz) = d96ba235a4207aee94b1436ac084448d69ec7042e477a0649da8148bb044c729
-SIZE (pygopherd_2.0.16.tar.gz) = 255475
+TIMESTAMP = 1506043804
+SHA256 (jgoerzen-pygopherd-debian-2.0.18.4_GH0.tar.gz) = 32b330d72afa3d4b44b2257af0235fc22f9ffbd302daf2f7054e25b3be8f2126
+SIZE (jgoerzen-pygopherd-debian-2.0.18.4_GH0.tar.gz) = 276798
diff --git a/net/pygopherd/pkg-plist b/net/pygopherd/pkg-plist
index 8b45cdb57aa7..f4495bbca1af 100644
--- a/net/pygopherd/pkg-plist
+++ b/net/pygopherd/pkg-plist
@@ -130,8 +130,8 @@ etc/pygopherd/mime.types
 %%PYTHON_SITELIBDIR%%/pygopherd/zipfile.py
 %%PYTHON_SITELIBDIR%%/pygopherd/zipfile.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/zipfile.pyo
-%%PYTHON_SITELIBDIR%%/pygopherd-2.0.15-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/pygopherd-2.0.15-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/pygopherd-2.0.15-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/pygopherd-2.0.15-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%PYTHON_SITELIBDIR%%/pygopherd-2.0.18-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/pygopherd-2.0.18-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/pygopherd-2.0.18-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/pygopherd-2.0.18-py%%PYTHON_VER%%.egg-info/top_level.txt
 man/man8/pygopherd.8.gz