Index: head/mail/roundcube-carddav/Makefile
===================================================================
--- head/mail/roundcube-carddav/Makefile	(revision 453166)
+++ head/mail/roundcube-carddav/Makefile	(revision 453167)
@@ -1,36 +1,40 @@
 # Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	carddav
 PORTVERSION=	2.0.4
-DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
+MASTER_SITES=	https://github.com/blind-coder/rcmcarddav/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	roundcube-
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Roundcube CardDAV plugin
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	roundcube>=1.0:mail/roundcube
 RUN_DEPENDS=	roundcube>=1.0:mail/roundcube
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	blind-coder
-GH_PROJECT=	rcmcarddav
+# Cannot use USE_GITHUB, as the original tarball doesn't come with the bundled
+# sabre library.
+#USE_GITHUB=	yes
+#GH_ACCOUNT=	blind-coder
+#GH_PROJECT=	rcmcarddav
 
 USES=		php tar:bz2
 USE_PHP=	simplexml sockets curl
 
 WWWDIR=		${PREFIX}/www/roundcube/plugins/carddav
 
 do-install:
 	${FIND} ${WRKSRC} -name "*.orig" -delete
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC} && ${PAX} -r -w . ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
Index: head/mail/roundcube-carddav/distinfo
===================================================================
--- head/mail/roundcube-carddav/distinfo	(revision 453166)
+++ head/mail/roundcube-carddav/distinfo	(revision 453167)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509359873
-SHA256 (blind-coder-rcmcarddav-v2.0.4_GH0.tar.gz) = 87a6f564bdda268a8569f855697fb00940f67508c6827cf86139dcc89b607c4a
-SIZE (blind-coder-rcmcarddav-v2.0.4_GH0.tar.gz) = 50542
+TIMESTAMP = 1509360656
+SHA256 (carddav-2.0.4.tar.bz2) = d24da18a9c8f1058be3468e74daf8ead14a1ed755c4cdf42b40d4fbbeeadf0ba
+SIZE (carddav-2.0.4.tar.bz2) = 298144