diff --git a/mail/ovs/Makefile b/mail/ovs/Makefile
index ba1c6fd1d8cb..9b04f8ea05a9 100644
--- a/mail/ovs/Makefile
+++ b/mail/ovs/Makefile
@@ -1,62 +1,71 @@
 PORTNAME=	ovs
-PORTVERSION=	1.05
-PORTREVISION=	5
+PORTVERSION=	1.06
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.oav.net/openvisp/stats/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RRDtool frontend for mail statistics
-WWW=		http://openvisp.fr/
+WWW=		https://github.com/xbeaudouin/openvisp
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rrdtool>=0:databases/rrdtool \
-		p5-File-Tail>=0:devel/p5-File-Tail
+RUN_DEPENDS=	p5-File-Tail>=0:devel/p5-File-Tail \
+		rrdtool>=0:databases/rrdtool
 
-NO_BUILD=	yes
-NO_ARCH=	yes
 USES=		perl5 shebangfix
-SHEBANG_FILES=	ovs.pl ovs.cgi
+USE_GITHUB=	yes
+GH_ACCOUNT=	xbeaudouin
+GH_PROJECT=	openvisp
+GH_TAGNAME=	1e17895bbcb70ee66370676546d17e540e629b08
+USE_RC_SUBR=	${PORTNAME}
+
+SHEBANG_FILES=	ovs.cgi ovs.pl
 
 CGIDIR?=	${PREFIX}/www/cgi-bin
 DATADIR?=	/var/db/ovs
+NO_ARCH=	yes
+NO_BUILD=	yes
+
 WWWROOT?=	${PREFIX}/www/data
 OVS_USER?=	${WWWOWN}
 OVS_GROUP?=	${WWWGRP}
 
-USE_RC_SUBR=	${PORTNAME}
-SUB_LIST+=	OVS_USER=${OVS_USER} OVS_GROUP=${OVS_GROUP}
-PLIST_SUB=	CGIDIR=${CGIDIR:S,${PREFIX}/,,} WWWROOT=${WWWROOT:S,${PREFIX}/,,} \
-		OVS_USER=${OVS_USER} OVS_GROUP=${OVS_GROUP}
+SUB_LIST+=	OVS_GROUP=${OVS_GROUP} \
+		OVS_USER=${OVS_USER}
+
+WRKSRC_SUBDIR=	stats/trunk/
 
-PORTDOCS=	README CHANGES COPYING CHANGES.old README.old
+PLIST_SUB=	CGIDIR=${CGIDIR:S,${PREFIX}/,,} \
+		OVS_GROUP=${OVS_GROUP} \
+		OVS_USER=${OVS_USER} \
+		WWWROOT=${WWWROOT:S,${PREFIX}/,,}
+PORTDOCS=	CHANGES CHANGES.old COPYING README README.old
 
 OPTIONS_DEFINE=	DOCS
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may set following options:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "DATADIR=/var/db/ovs		Where do you put RRD databases?"
 	@${ECHO_MSG} "CGIDIR=${PREFIX}/www/cgi-bin      Where do you put cgi?"
 	@${ECHO_MSG} "WWWROOT=${PREFIX}/www/data        Where do you put httpd's document root?"
 	@${ECHO_MSG} "OVS_USER=www			User to run mailgraph (Default: ${WWWOWN})"
 	@${ECHO_MSG} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/ovs.cgi
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${CGIDIR}
 	@${MKDIR} ${STAGEDIR}${WWWROOT}/ovs
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/ovs.pl ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/ovs.cgi ${STAGEDIR}${CGIDIR}
 	${INSTALL_DATA} ${WRKSRC}/ovs.css ${STAGEDIR}${WWWROOT}/ovs
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for f in ${PORTDOCS}; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${STAGEDIR}${DOCSDIR}; \
 	done
 
 .include <bsd.port.mk>
diff --git a/mail/ovs/distinfo b/mail/ovs/distinfo
index 8b745e74c61d..7e8dda675603 100644
--- a/mail/ovs/distinfo
+++ b/mail/ovs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ovs-1.05.tar.gz) = 155dde11c44e1c3cf743530fc54ef3e176dcec581ac52c0945612026331c0502
-SIZE (ovs-1.05.tar.gz) = 26509
+TIMESTAMP = 1730581858
+SHA256 (xbeaudouin-openvisp-1.06-1e17895bbcb70ee66370676546d17e540e629b08_GH0.tar.gz) = d346484224865432cac055beee057d4d5825b9c65e51298edb15791338b7a252
+SIZE (xbeaudouin-openvisp-1.06-1e17895bbcb70ee66370676546d17e540e629b08_GH0.tar.gz) = 14492663
diff --git a/mail/ovs/files/patch-ovs.cgi b/mail/ovs/files/patch-ovs.cgi
index 0d8880cafd4b..bdacb390ae56 100644
--- a/mail/ovs/files/patch-ovs.cgi
+++ b/mail/ovs/files/patch-ovs.cgi
@@ -1,24 +1,25 @@
---- ovs.cgi.orig	Mon Sep  3 18:19:22 2007
-+++ ovs.cgi	Fri Sep  7 20:28:39 2007
+--- ovs.cgi.orig	Mon Sep  3 18:19:22 2007 UTC
++++ ovs.cgi
+dd	Fri Sep  7 20:28:39 2007
 @@ -25,9 +25,9 @@
  my $points_per_sample = 3;
  my $ypoints = 160;
  my $ypoints_err = 260;
 -my $rrd = 'ovs.rrd';		 # path to where the RRD database is
 -my $rrd_virus = 'ovs_virus.rrd'; # path to where the Virus RRD database is
 -my $rrd_pop = 'ovs_pop.rrd';	 # path to where the Virus RRD database is
 +my $rrd = '%%DATADIR%%/ovs.rrd';		 # path to where the RRD database is
 +my $rrd_virus = '%%DATADIR%%/ovs_virus.rrd'; # path to where the Virus RRD database is
 +my $rrd_pop = '%%DATADIR%%/ovs_pop.rrd';	 # path to where the Virus RRD database is
  my $tmp_dir = '/tmp/ovs';	 # temporary directory where to store the images
  
  my @graphs = (
 @@ -310,7 +310,7 @@
  <title>Mail statistics for $host</title>
  <meta http-equiv="Refresh" content="300" />
  <meta http-equiv="Pragma" content="no-cache" />
 -<link rel="stylesheet" href="ovs.css" type="text/css" />
 +<link rel="stylesheet" href="/ovs/ovs.css" type="text/css" />
  </head>
  <body>
  HEADER