diff --git a/dns/dnswall/Makefile b/dns/dnswall/Makefile
index 7abfbd4701d4..31065db5fa13 100644
--- a/dns/dnswall/Makefile
+++ b/dns/dnswall/Makefile
@@ -1,25 +1,28 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dnswall
 PORTVERSION=	0.1.4
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	dns security
-MASTER_SITES=	GOOGLE_CODE LOCAL/ehaupt
-PROJECTHOST=	google-dnswall
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Daemon that filters out private IP addresses in DNS responses
 
-BROKEN=		Unfetchable (google code has gone away)
+LICENSE=	APACHE20
 
 GNU_CONFIGURE=	yes
-USES=		autoreconf dos2unix
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USES=		autoreconf libtool dos2unix
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	abarth
+GH_PROJECT=	google-dnswall
+GH_TAGNAME=	164174a
 
 PORTDOCS=	README
 PLIST_FILES=	bin/dnswall
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/dns/dnswall/distinfo b/dns/dnswall/distinfo
index d422ef4c42d1..6f03cf19ff05 100644
--- a/dns/dnswall/distinfo
+++ b/dns/dnswall/distinfo
@@ -1,2 +1,3 @@
-SHA256 (dnswall-0.1.4.tar.gz) = 8197c99e69ea389735dad0ffc9b76ee2ae0a293c13e4c4e548497c106cfce895
-SIZE (dnswall-0.1.4.tar.gz) = 67735
+TIMESTAMP = 1475438636
+SHA256 (abarth-google-dnswall-v0.1.4-164174a_GH0.tar.gz) = 31f160ed8b8ed9d12c7b8e682e147dfa7b219b401a0a9060b2b41cfc74877f7c
+SIZE (abarth-google-dnswall-v0.1.4-164174a_GH0.tar.gz) = 16690
diff --git a/dns/dnswall/files/patch-Makefile.am b/dns/dnswall/files/patch-Makefile.am
index c9160882b96f..3682df2c0b51 100644
--- a/dns/dnswall/files/patch-Makefile.am
+++ b/dns/dnswall/files/patch-Makefile.am
@@ -1,10 +1,10 @@
---- ./Makefile.am.orig	2008-01-28 20:28:44.000000000 +0100
-+++ ./Makefile.am	2008-01-28 20:28:59.000000000 +0100
+--- Makefile.am.orig	2016-10-02 20:06:27 UTC
++++ Makefile.am
 @@ -2,5 +2,5 @@
  
- SUBDIRS = src
+ SUBDIRS = src test
  
 -docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
 -dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README
 +docdir = $(prefix)/share/doc/$(PACKAGE)
 +dist_doc_DATA = README
diff --git a/dns/dnswall/pkg-descr b/dns/dnswall/pkg-descr
index 01d63cb34e95..0590486f7612 100644
--- a/dns/dnswall/pkg-descr
+++ b/dns/dnswall/pkg-descr
@@ -1,5 +1,5 @@
 dnswall is a daemon that filters out private IP addresses in DNS responses. It
 is designed to be used in conjunction with an existing recursive DNS resolver
 in order to protect networks against DNS rebinding attacks.
 
-WWW: http://code.google.com/p/google-dnswall/
+WWW: https://github.com/abarth/google-dnswall