diff --git a/mail/roundcube-veximaccountadmin/Makefile b/mail/roundcube-veximaccountadmin/Makefile
index 2430400c0e25..31ada091ac3e 100644
--- a/mail/roundcube-veximaccountadmin/Makefile
+++ b/mail/roundcube-veximaccountadmin/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	veximaccountadmin
-PORTVERSION=	0.1
-PORTREVISION=	2
+PORTVERSION=	0.1.20171224
 CATEGORIES=	mail
-MASTER_SITES=	http://axel.sjostedt.no/misc/files/
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
-DISTNAME=	rcube_plg_veximaccountadmin
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Roundcube vexim account admin plugin
 WWW=		http://axel.sjostedt.no/misc/dev/roundcube/
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=0.9:mail/roundcube@${PHP_FLAVOR}
+RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.3:mail/roundcube@${PHP_FLAVOR}
 
 USES=		php:flavors
-IGNORE_WITH_PHP=	81 82
+IGNORE_WITH_PHP=	82
 
 WWWDIR=		${PREFIX}/www/roundcube
 REINPLACE_ARGS=	-i ''
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/veximaccountadmin
-
 PLIST_SUB+=	PLUGINDIR="${PLUGINDIR}"
 PLUGINDIR=	${WWWDIR}/plugins/${PORTNAME}
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	vexim
+GH_PROJECT=	Roundcube-Plugin-VeximAccountAdmin
+GH_TAGNAME=	3912bd9
+
 post-patch:
 	@${REINPLACE_CMD} -e 's/new rcube_mdb2/new rcube_db/g' ${WRKSRC}/veximaccountadmin.php
 
 do-install:
 	@${ECHO} "Installing in ${PLUGINDIR}"
 	${MKDIR} ${STAGEDIR}/${PLUGINDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${PLUGINDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-veximaccountadmin/distinfo b/mail/roundcube-veximaccountadmin/distinfo
index 5f82cfbcf23b..aea321dd47f7 100644
--- a/mail/roundcube-veximaccountadmin/distinfo
+++ b/mail/roundcube-veximaccountadmin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rcube_plg_veximaccountadmin.tar.gz) = 4017ff6db883554bfabd42389e39010f9c25cae974a93bf4d24b96645a03641e
-SIZE (rcube_plg_veximaccountadmin.tar.gz) = 23278
+TIMESTAMP = 1659710602
+SHA256 (vexim-Roundcube-Plugin-VeximAccountAdmin-0.1.20171224-3912bd9_GH0.tar.gz) = 7c51b51384e1c021658ff90ab18761cc33d820ceddcbf126e2e65587219b562f
+SIZE (vexim-Roundcube-Plugin-VeximAccountAdmin-0.1.20171224-3912bd9_GH0.tar.gz) = 22956
diff --git a/mail/roundcube-veximaccountadmin/pkg-plist b/mail/roundcube-veximaccountadmin/pkg-plist
index 82e977b35157..4825cb884eae 100644
--- a/mail/roundcube-veximaccountadmin/pkg-plist
+++ b/mail/roundcube-veximaccountadmin/pkg-plist
@@ -1,11 +1,13 @@
-%%PLUGINDIR%%/CHANGELOG
-%%PLUGINDIR%%/LICENSE
-%%PLUGINDIR%%/README
-%%PLUGINDIR%%/config.inc.php.dist
-%%PLUGINDIR%%/delete.png
-%%PLUGINDIR%%/localization/en_US.inc
-%%PLUGINDIR%%/localization/fr_FR.inc
-%%PLUGINDIR%%/localization/nb_NO.inc
-%%PLUGINDIR%%/veximaccountadmin.css
-%%PLUGINDIR%%/veximaccountadmin.js
-%%PLUGINDIR%%/veximaccountadmin.php
+%%WWWDIR%%/plugins/veximaccountadmin/CHANGELOG.md
+%%WWWDIR%%/plugins/veximaccountadmin/LICENSE
+%%WWWDIR%%/plugins/veximaccountadmin/README.md
+@sample %%WWWDIR%%/plugins/veximaccountadmin/config.inc.php.dist %%WWWDIR%%/plugins/veximaccountadmin/config.inc.php
+%%WWWDIR%%/plugins/veximaccountadmin/delete.png
+%%WWWDIR%%/plugins/veximaccountadmin/localization/en_US.inc
+%%WWWDIR%%/plugins/veximaccountadmin/localization/fr_FR.inc
+%%WWWDIR%%/plugins/veximaccountadmin/localization/it_IT.inc
+%%WWWDIR%%/plugins/veximaccountadmin/localization/nb_NO.inc
+%%WWWDIR%%/plugins/veximaccountadmin/veximaccountadmin.css
+%%WWWDIR%%/plugins/veximaccountadmin/veximaccountadmin.js
+%%WWWDIR%%/plugins/veximaccountadmin/veximaccountadmin.php
+%%WWWDIR%%/plugins/veximaccountadmin/veximaccountadmin.php.bak