diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 225e91684447..c243351c6911 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -3,32 +3,29 @@
 
 PORTNAME=	vtun
 PORTVERSION=	3.0.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF LOCAL/mat/vtun
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Virtual Tunnels over TCP/IP networks with traffic shaping
 
-BROKEN=		unfetchable
-
 LICENSE=	GPLv2
 
-DEPRECATED=		No longer supported by upline
-EXPIRATION_DATE=	2021-09-30
-
 LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
-CFLAGS+=	-ansi -Wno-pointer-sign
 USES=		autoreconf localbase ssl
+USE_RC_SUBR=	vtunclient vtund
 GNU_CONFIGURE=	yes
+
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-ssl-headers=${OPENSSLINC} \
 		--with-ssl-lib=${OPENSSLLIB} \
 		--with-lzo-headers=${LOCALBASE}/include/lzo \
 		--with-lzo-lib=${LOCALBASE}/lib
 CONFIGURE_ENV=	YACC=${YACC}
-USE_RC_SUBR=	vtunclient vtund
+
+CFLAGS+=	-ansi -Wno-pointer-sign
 
 ALL_TARGET=	vtund
 
@@ -48,13 +45,12 @@ post-patch:
 		${WRKSRC}/configure
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vtund
-	@${INSTALL_DATA} ${WRKSRC}/vtund.conf ${STAGEDIR}${PREFIX}/etc/vtund.conf.sample
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vtund
+	${INSTALL_DATA} ${WRKSRC}/vtund.conf ${STAGEDIR}${PREFIX}/etc/vtund.conf.sample
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@cd ${STAGEDIR}${PREFIX}/man/man1/ && \
-	${LN} -s vtund.8 ../man1/vtun.1
+	${RLN} ${STAGEDIR}${PREFIX}/man/man8/vtund.8 ${STAGEDIR}${PREFIX}/man/man1/vtun.1
 
 .include <bsd.port.mk>
diff --git a/net/vtun/distinfo b/net/vtun/distinfo
index 6189aa5e6a05..c5562efed6d5 100644
--- a/net/vtun/distinfo
+++ b/net/vtun/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474289088
-SHA256 (vtun-3.0.4.tar.gz) = 79d9ccfec98bb13b19523c483f2192e6db7d0c24af8382506f80cc335c643085
-SIZE (vtun-3.0.4.tar.gz) = 130877
+TIMESTAMP = 1573738292
+SHA256 (vtun-3.0.4.tar.gz) = abf8df6b15e3febeaaeae2ce24ead7105eb1537ad4ec0d830c83cbb684fd98b9
+SIZE (vtun-3.0.4.tar.gz) = 132691
diff --git a/net/vtun/files/patch-Makefile.in b/net/vtun/files/patch-Makefile.in
index a2855d917a1a..3d6ddf3d4e56 100644
--- a/net/vtun/files/patch-Makefile.in
+++ b/net/vtun/files/patch-Makefile.in
@@ -1,6 +1,8 @@
---- Makefile.in.orig	2012-07-08 21:55:38.000000000 -0700
-+++ Makefile.in	2014-06-09 23:06:38.000000000 -0700
-@@ -28,7 +28,7 @@
+Cleanup install procedure.
+
+--- Makefile.in.orig	2016-10-01 21:46:00 UTC
++++ Makefile.in
+@@ -28,7 +28,7 @@ LEX = @LEX@
  LEXFLAGS = -t 
  
  INSTALL = @INSTALL@
@@ -9,7 +11,7 @@
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ OBJS = main.o cfg_file.tab.o cfg_file.lex.o server.o c
  
  CONFIGURE_FILES = Makefile config.status config.cache config.h config.log 
  
@@ -18,7 +20,7 @@
  	$(CC) $(CFLAGS) $(DEFS) -c $<
  
  vtund: $(OBJS)
-@@ -80,25 +80,25 @@
+@@ -80,25 +80,25 @@ distclean: clean
  	rm -f `cat vtun.drivers`	
  
  install_man: 
diff --git a/net/vtun/files/patch-freebsd__tun_dev.c b/net/vtun/files/patch-freebsd__tun_dev.c
index 537d3e03a1cd..7076427caa17 100644
--- a/net/vtun/files/patch-freebsd__tun_dev.c
+++ b/net/vtun/files/patch-freebsd__tun_dev.c
@@ -1,5 +1,7 @@
---- freebsd/tun_dev.c.orig	2008-01-07 14:36:10.000000000 -0800
-+++ freebsd/tun_dev.c	2016-09-19 20:06:49.919502000 -0700
+Part of extended mode being an argument and not a compile time decision.
+
+--- freebsd/tun_dev.c.orig	2016-10-01 21:46:01 UTC
++++ freebsd/tun_dev.c
 @@ -35,6 +35,8 @@
  #include "vtun.h"
  #include "lib.h"
@@ -9,7 +11,7 @@
  /* 
   * Allocate TUN device, returns opened fd. 
   * Stores dev name in the first arg(must be large enough).
-@@ -58,10 +60,8 @@
+@@ -58,10 +60,8 @@ int tun_open(char *dev)
         }
      }
      if( fd > -1 ){
diff --git a/net/vtun/files/patch-main.c b/net/vtun/files/patch-main.c
index 88aecd8860c4..9b04a90810bc 100644
--- a/net/vtun/files/patch-main.c
+++ b/net/vtun/files/patch-main.c
@@ -1,3 +1,6 @@
+Part of extended mode being an argument and not a compile time decision.
+Some bits about using vfork, or not, and pidfile as an argument.
+
 --- main.c.orig	2013-07-07 20:31:22 UTC
 +++ main.c
 @@ -39,9 +39,9 @@
diff --git a/net/vtun/files/patch-vtund.8 b/net/vtun/files/patch-vtund.8
index 8912af8a74f9..dee1600dfb81 100644
--- a/net/vtun/files/patch-vtund.8
+++ b/net/vtun/files/patch-vtund.8
@@ -1,6 +1,9 @@
---- vtund.8.orig	2016-09-17 13:01:21.000000000 -0700
-+++ vtund.8	2016-09-19 20:38:04.531515000 -0700
-@@ -48,6 +48,12 @@
+Part of extended mode being an argument and not a compile time decision.
+Some bits about using vfork, or not, and pidfile as an argument.
+
+--- vtund.8.orig	2016-09-17 20:01:21 UTC
++++ vtund.8
+@@ -48,6 +48,12 @@ vtund \- VTun(Virtual Tunnel) daemon.
  [ 
  .I -n 
  ] 
@@ -13,10 +16,11 @@
  <
  .I session 
  >
-@@ -116,6 +122,14 @@
+@@ -115,6 +121,14 @@ Connect 
+ .I timeout
  Default is 30 seconds. This options is equivalent to the 'timeout' option of
  config file.
- .TP
++.TP
 +.I -e
 +Use vtun-v6 extended mode.
 +.TP
@@ -24,7 +28,6 @@
 +Connect 
 +.I z pid_file
 +The full pathname of the file containing the PID of the daemon in server mode.
-+.TP
+ .TP
  .I session 
  Session name from the config file.
- .TP