diff --git a/mail/rcube-yubikey-plugin/Makefile b/mail/rcube-yubikey-plugin/Makefile
index 0bdeb3fc292..b59fc93263b 100644
--- a/mail/rcube-yubikey-plugin/Makefile
+++ b/mail/rcube-yubikey-plugin/Makefile
@@ -1,27 +1,23 @@
-# $OpenBSD: Makefile,v 1.7 2015/06/05 06:00:21 robert Exp $
+# $OpenBSD: Makefile,v 1.8 2016/05/22 19:19:13 sthen Exp $
 
 COMMENT=	roundcube plugin: authenticate via Yubikey HTTPS API
 
-V=		1.3
-DISTNAME=	rcube-yubikey-plugin-1.3
-DISTFILES=	${DISTNAME}{$V}.tar.gz
+GH_ACCOUNT=	northox
+GH_PROJECT=	roundcube-yubikey-plugin
+GH_TAGNAME=	1.4
+PKGNAME=	rcube-yubikey-plugin-${GH_TAGNAME}
 CATEGORIES=	mail www
-HOMEPAGE=	https://github.com/northox/roundcube-yubikey-plugin\#readme
-REVISION=	0
 
 MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=	https://github.com/northox/roundcube-yubikey-plugin/archive/
-
 NO_BUILD=	Yes
 NO_TEST=	Yes
 PKG_ARCH=	*
 
 PREFIX=		${VARBASE}/www
-WRKDIST=	${WRKDIR}/roundcube-yubikey-plugin-$V
 TINSTDIR=	${TRUEPREFIX}/roundcubemail/plugins/yubikey_authentication
 INSTDIR=	${WRKINST}${TINSTDIR}
 SUBST_VARS=	INSTDIR TINSTDIR
diff --git a/mail/rcube-yubikey-plugin/distinfo b/mail/rcube-yubikey-plugin/distinfo
index 9d4ec404a14..4a89e3a90b1 100644
--- a/mail/rcube-yubikey-plugin/distinfo
+++ b/mail/rcube-yubikey-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rcube-yubikey-plugin-1.3.tar.gz) = zD9tODGcygve/rxsdSfcGRDqq09ygtZmMFmilOFB3oE=
-SIZE (rcube-yubikey-plugin-1.3.tar.gz) = 13195
+SHA256 (roundcube-yubikey-plugin-1.4.tar.gz) = yX/kgM9zSkDWQQtvT6cu9NmhWkfrU4tjqcp1LPLG3rw=
+SIZE (roundcube-yubikey-plugin-1.4.tar.gz) = 13762
diff --git a/mail/rcube-yubikey-plugin/pkg/PLIST b/mail/rcube-yubikey-plugin/pkg/PLIST
index ff3cdf785a8..97baf48243f 100644
--- a/mail/rcube-yubikey-plugin/pkg/PLIST
+++ b/mail/rcube-yubikey-plugin/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.2 2014/11/13 22:49:51 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2016/05/22 19:19:13 sthen Exp $
 roundcubemail/plugins/yubikey_authentication/
 roundcubemail/plugins/yubikey_authentication/LICENSE
 roundcubemail/plugins/yubikey_authentication/README.md
+roundcubemail/plugins/yubikey_authentication/composer.json
 roundcubemail/plugins/yubikey_authentication/config.inc.php.dist
 @sample roundcubemail/plugins/yubikey_authentication/config.inc.php
 roundcubemail/plugins/yubikey_authentication/lib/