diff --git a/mail/roundcube-sieverules/Makefile b/mail/roundcube-sieverules/Makefile
index 7a70673c4dbf..4033c09fe530 100644
--- a/mail/roundcube-sieverules/Makefile
+++ b/mail/roundcube-sieverules/Makefile
@@ -2,18 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	sieverules
-PORTVERSION=	1.17.1
+PORTVERSION=	0.9.0
+PORTEPOCH=	1
 CATEGORIES=	mail
-MASTER_SITES=	http://www.tehinterweb.co.uk/roundcube/plugins/
 PKGNAMEPREFIX=	roundcube-
-DISTNAME=	${PORTNAME}
 
 MAINTAINER=	anes@anes.su
 COMMENT=	Roundcube webmail sieve plugin
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	roundcube>=0.8:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=0.9.0:${PORTSDIR}/mail/roundcube
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	JohnDoh
+GH_PROJECT=	Roundcube-Plugin-SieveRules-Managesieve
+GH_TAGNAME=	v${PORTVERSION}
+GH_COMMIT=	430d810
 
 NO_BUILD=	yes
 
diff --git a/mail/roundcube-sieverules/distinfo b/mail/roundcube-sieverules/distinfo
index 2ecc91dd6182..a6065c4b402f 100644
--- a/mail/roundcube-sieverules/distinfo
+++ b/mail/roundcube-sieverules/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sieverules.tar.gz) = 2a35abc26022c940e8469ac86edc4b5aa3265c9c7da282ef28919024a1530792
-SIZE (sieverules.tar.gz) = 130304
+SHA256 (sieverules-0.9.0.tar.gz) = 71b6f09279e5422354932deb4eafcd9562c600ea398a5c3c193810b2f0eaea78
+SIZE (sieverules-0.9.0.tar.gz) = 130094
diff --git a/mail/roundcube-sieverules/pkg-descr b/mail/roundcube-sieverules/pkg-descr
index ce861c695603..4d2ec82a8abe 100644
--- a/mail/roundcube-sieverules/pkg-descr
+++ b/mail/roundcube-sieverules/pkg-descr
@@ -1,3 +1,3 @@
 Another one sieve filter plugin for roundcube webmail.
 
-WWW:	http://www.tehinterweb.co.uk/roundcube/
+WWW: http://www.tehinterweb.co.uk/roundcube/
diff --git a/mail/roundcube-sieverules/pkg-plist b/mail/roundcube-sieverules/pkg-plist
index 3d46821d6408..d15bff23e249 100644
--- a/mail/roundcube-sieverules/pkg-plist
+++ b/mail/roundcube-sieverules/pkg-plist
@@ -1,6 +1,6 @@
+%%WWWDIR%%/.gitignore
 %%WWWDIR%%/CHANGELOG
-%%WWWDIR%%/README
-%%WWWDIR%%/composer.json
+%%WWWDIR%%/README.md
 %%WWWDIR%%/config.inc.php.dist
 %%WWWDIR%%/importFilters/avelsieve.php
 %%WWWDIR%%/importFilters/ingo.php
@@ -34,6 +34,7 @@
 %%WWWDIR%%/package.xml
 %%WWWDIR%%/sieverules.js
 %%WWWDIR%%/sieverules.php
+%%WWWDIR%%/skins/classic/cross.gif
 %%WWWDIR%%/skins/classic/help.gif
 %%WWWDIR%%/skins/classic/icons.gif
 %%WWWDIR%%/skins/classic/icons.png
@@ -46,6 +47,8 @@
 %%WWWDIR%%/skins/classic/templates/editsieverule.html
 %%WWWDIR%%/skins/classic/templates/setupsieverules.html
 %%WWWDIR%%/skins/classic/templates/sieverules.html
+%%WWWDIR%%/skins/classic/tick.gif
+%%WWWDIR%%/skins/larry/cross.png
 %%WWWDIR%%/skins/larry/help.png
 %%WWWDIR%%/skins/larry/icons.png
 %%WWWDIR%%/skins/larry/iehacks.css
@@ -57,6 +60,7 @@
 %%WWWDIR%%/skins/larry/templates/editsieverule.html
 %%WWWDIR%%/skins/larry/templates/setupsieverules.html
 %%WWWDIR%%/skins/larry/templates/sieverules.html
+%%WWWDIR%%/skins/larry/tick.png
 @dirrm %%WWWDIR%%/skins/larry/templates
 @dirrm %%WWWDIR%%/skins/larry
 @dirrm %%WWWDIR%%/skins/classic/templates