diff --git a/net-mgmt/ipv6mon/Makefile b/net-mgmt/ipv6mon/Makefile
index a0e604b8bf68..24814b6531b4 100644
--- a/net-mgmt/ipv6mon/Makefile
+++ b/net-mgmt/ipv6mon/Makefile
@@ -1,46 +1,48 @@
 # $FreeBSD$
 
 PORTNAME=	ipv6mon
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://www.si6networks.com/tools/ipv6mon/
-DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Tool for monitoring IPv6 address usage
 
-BROKEN=		unfetchable
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2020-05-05
-
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 USES=		uidfix
+GH_ACCOUNT=	fgont
+GH_PROJECT=	ipv6mon
+GH_TAGNAME=	454292a393ddd79db7131b6e7a8d005a7f49bd92
+USE_GCC=	any
+USE_GITHUB=	nodefault
 CFLAGS+=	-DIPV6MON_CONF=\\\"${PREFIX}/etc/ipv6mon.conf\\\"
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 USE_RC_SUBR=	${PORTNAME}
 
 PORTDOCS=	README.TXT \
 		ipv6mon-installation-notes.odt \
 		ipv6mon-installation-notes.pdf \
 		ipv6mon-manual.odt \
 		ipv6mon-manual.pdf
+WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	@${INSTALL_DATA} ${FILESDIR}/Makefile ${WRKSRC}
-	@${INSTALL_DATA} ${WRKSRC}/manuals/* ${WRKSRC}
+	${INSTALL_DATA} ${FILESDIR}/Makefile ${WRKSRC}
+	${INSTALL_DATA} ${WRKSRC}/manuals/* ${WRKSRC}
+	@${REINPLACE_CMD} 's|/etc/|${PREFIX}/etc/|'\
+		${WRKSRC}/ipv6mon.8 ${WRKSRC}/ipv6mon.conf.5
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/rc.d
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/ipv6mon/distinfo b/net-mgmt/ipv6mon/distinfo
index 70941fde0037..a0caa4080afd 100644
--- a/net-mgmt/ipv6mon/distinfo
+++ b/net-mgmt/ipv6mon/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ipv6mon-v1.0.tar.gz) = f714a877de4fbf80126c4b8ad2e3496739695ee1eb3a914eae344fdd6325e138
-SIZE (ipv6mon-v1.0.tar.gz) = 211625
+TIMESTAMP = 1575355108
+SHA256 (ipv6mon-1.0.tar.gz) = 01545101a5032867363be9d89a0dbf7f9c9eb3d67277e406b56889a9856c2ef8
+SIZE (ipv6mon-1.0.tar.gz) = 207872
diff --git a/net-mgmt/ipv6mon/files/patch-ipv6mon.c b/net-mgmt/ipv6mon/files/patch-ipv6mon.c
index 5e67c75a4b66..6c8dd37f5399 100644
--- a/net-mgmt/ipv6mon/files/patch-ipv6mon.c
+++ b/net-mgmt/ipv6mon/files/patch-ipv6mon.c
@@ -1,21 +1,21 @@
---- ipv6mon.c.orig	2012-09-20 13:02:24.000000000 +0900
-+++ ipv6mon.c	2012-09-20 13:02:26.000000000 +0900
-@@ -277,7 +277,7 @@
+--- ipv6mon.c.orig	2012-10-26 09:06:17 UTC
++++ ipv6mon.c
+@@ -277,7 +277,7 @@ int main(int argc, char **argv){
  	}
  
  	if(!configfile_f){
 -		configfile="/etc/ipv6mon.conf";
 +		configfile=IPV6MON_CONF;
  	}
  
  	if(process_config_file(configfile) == -1)
-@@ -888,7 +888,8 @@
+@@ -888,7 +888,8 @@ void print_help(void){
  	usage();
      
  	puts("\nOPTIONS:\n"
 -	     "  --config-file, -c    Configuration file pathname (defaults to '/etc/ipv6mon.conf')\n"
 +	     "  --config-file, -c    Configuration file pathname (defaults to '"
 + IPV6MON_CONF "')\n"
  		 "  --show-config, -q    Shows configuration values and quits\n"
  	     "  --help, -h           Print help for the scan6 tool\n"
  	     "  --verbose, -v        Be verbose\n"