diff --git a/mail/rcube-contextmenu/Makefile b/mail/rcube-contextmenu/Makefile
index 651185536e3..305aa75bd8e 100644
--- a/mail/rcube-contextmenu/Makefile
+++ b/mail/rcube-contextmenu/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2013/04/11 16:11:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.2 2013/04/16 13:37:42 sthen Exp $
 
 COMMENT=	roundcube plugin: context-sensitive menus
 
-DISTNAME=	contextmenu-1.9
+DISTNAME=	contextmenu-1.10
 PKGNAME=	rcube-${DISTNAME}
 CATEGORIES=	mail www
 HOMEPAGE=	http://www.tehinterweb.co.uk/roundcube/\#picontextmenu
@@ -25,7 +25,7 @@ TINSTDIR=	${TRUEPREFIX}/roundcubemail/plugins
 SUBST_VARS=	INSTDIR TINSTDIR
 
 MODULES=	lang/php
-RUN_DEPENDS=	mail/roundcubemail>=0.8,<0.9
+RUN_DEPENDS=	mail/roundcubemail>=0.9
 
 do-install:
 	${INSTALL_DATA_DIR} ${INSTDIR}
diff --git a/mail/rcube-contextmenu/distinfo b/mail/rcube-contextmenu/distinfo
index a78f9c8289c..115f1fd1507 100644
--- a/mail/rcube-contextmenu/distinfo
+++ b/mail/rcube-contextmenu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (contextmenu-1.9.tar.gz) = 704yp6FYCTsUXevRF8yc/Ar9nsFAu6u5uT5xWk04JbU=
-SIZE (contextmenu-1.9.tar.gz) = 46904
+SHA256 (contextmenu-1.10.tar.gz) = C/wwzh3sGeygRsrIlyRZgFeqCX0UvPIjCuj1MDZ6X/w=
+SIZE (contextmenu-1.10.tar.gz) = 47578
diff --git a/mail/rcube-contextmenu/pkg/PLIST b/mail/rcube-contextmenu/pkg/PLIST
index d5cd7d80f72..010be4d1106 100644
--- a/mail/rcube-contextmenu/pkg/PLIST
+++ b/mail/rcube-contextmenu/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2013/04/11 16:11:23 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.2 2013/04/16 13:37:42 sthen Exp $
 roundcubemail/plugins/contextmenu/
 roundcubemail/plugins/contextmenu/CHANGELOG
-roundcubemail/plugins/contextmenu/README
+roundcubemail/plugins/contextmenu/README.md
 roundcubemail/plugins/contextmenu/composer.json
 roundcubemail/plugins/contextmenu/contextmenu.js
 roundcubemail/plugins/contextmenu/contextmenu.php
diff --git a/mail/rcube-sieverules/Makefile b/mail/rcube-sieverules/Makefile
index e726fe8998f..fe43897d176 100644
--- a/mail/rcube-sieverules/Makefile
+++ b/mail/rcube-sieverules/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2013/04/11 15:41:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2013/04/16 13:37:33 sthen Exp $
 
 COMMENT=	roundcube plugin: sieve rules (managesieve)
 
-DISTNAME=	sieverules-1.17.1
-REVISION=	0
+DISTNAME=	sieverules-1.18
 PKGNAME=	rcube-${DISTNAME}
 CATEGORIES=	mail www
 HOMEPAGE=	http://www.tehinterweb.co.uk/roundcube/\#pisieverules
@@ -26,7 +25,7 @@ TINSTDIR=	${TRUEPREFIX}/roundcubemail/plugins
 SUBST_VARS=	INSTDIR TINSTDIR
 
 MODULES=	lang/php
-RUN_DEPENDS=	mail/roundcubemail>=0.8,<0.9
+RUN_DEPENDS=	mail/roundcubemail>=0.9
 
 do-install:
 	${INSTALL_DATA_DIR} ${INSTDIR}
diff --git a/mail/rcube-sieverules/distinfo b/mail/rcube-sieverules/distinfo
index aa2bc5695f7..11039538318 100644
--- a/mail/rcube-sieverules/distinfo
+++ b/mail/rcube-sieverules/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sieverules-1.17.1.tar.gz) = KjWrwmAiyUDoRprIbtxLWqMmXJx9ooLvKJGQJKFTB5I=
-SIZE (sieverules-1.17.1.tar.gz) = 130304
+SHA256 (sieverules-1.18.tar.gz) = WbKSGnmBla00fKIEWyb6+NK7oGf59FbgBCPzGxxZH7U=
+SIZE (sieverules-1.18.tar.gz) = 134591
diff --git a/mail/rcube-sieverules/patches/patch-config_inc_php_dist b/mail/rcube-sieverules/patches/patch-config_inc_php_dist
index bee286dddf0..322d5367118 100644
--- a/mail/rcube-sieverules/patches/patch-config_inc_php_dist
+++ b/mail/rcube-sieverules/patches/patch-config_inc_php_dist
@@ -1,7 +1,7 @@
-$OpenBSD: patch-config_inc_php_dist,v 1.1.1.1 2011/12/08 09:39:17 sthen Exp $
---- config.inc.php.dist.orig	Thu Sep  8 14:25:05 2011
-+++ config.inc.php.dist	Thu Sep  8 14:25:17 2011
-@@ -13,7 +13,8 @@
+$OpenBSD: patch-config_inc_php_dist,v 1.2 2013/04/16 13:37:33 sthen Exp $
+--- config.inc.php.dist.orig	Sun Feb 24 11:18:45 2013
++++ config.inc.php.dist	Tue Apr 16 14:25:10 2013
+@@ -14,7 +14,8 @@
  $rcmail_config['sieverules_host'] = 'localhost';
  
  // managesieve server port
diff --git a/mail/rcube-sieverules/pkg/PLIST b/mail/rcube-sieverules/pkg/PLIST
index c6282a0d652..0b3e9805b31 100644
--- a/mail/rcube-sieverules/pkg/PLIST
+++ b/mail/rcube-sieverules/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2013/01/03 22:41:56 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.4 2013/04/16 13:37:33 sthen Exp $
 roundcubemail/plugins/sieverules/
 roundcubemail/plugins/sieverules/CHANGELOG
-roundcubemail/plugins/sieverules/README
+roundcubemail/plugins/sieverules/README.md
 roundcubemail/plugins/sieverules/composer.json
 roundcubemail/plugins/sieverules/config.inc.php.dist
 @sample roundcubemail/plugins/sieverules/config.inc.php
@@ -44,6 +44,7 @@ roundcubemail/plugins/sieverules/sieverules.js
 roundcubemail/plugins/sieverules/sieverules.php
 roundcubemail/plugins/sieverules/skins/
 roundcubemail/plugins/sieverules/skins/classic/
+roundcubemail/plugins/sieverules/skins/classic/cross.gif
 roundcubemail/plugins/sieverules/skins/classic/help.gif
 roundcubemail/plugins/sieverules/skins/classic/icons.gif
 roundcubemail/plugins/sieverules/skins/classic/icons.png
@@ -57,7 +58,9 @@ roundcubemail/plugins/sieverules/skins/classic/templates/advancededitor.html
 roundcubemail/plugins/sieverules/skins/classic/templates/editsieverule.html
 roundcubemail/plugins/sieverules/skins/classic/templates/setupsieverules.html
 roundcubemail/plugins/sieverules/skins/classic/templates/sieverules.html
+roundcubemail/plugins/sieverules/skins/classic/tick.gif
 roundcubemail/plugins/sieverules/skins/larry/
+roundcubemail/plugins/sieverules/skins/larry/cross.png
 roundcubemail/plugins/sieverules/skins/larry/help.png
 roundcubemail/plugins/sieverules/skins/larry/icons.png
 roundcubemail/plugins/sieverules/skins/larry/iehacks.css
@@ -70,3 +73,4 @@ roundcubemail/plugins/sieverules/skins/larry/templates/advancededitor.html
 roundcubemail/plugins/sieverules/skins/larry/templates/editsieverule.html
 roundcubemail/plugins/sieverules/skins/larry/templates/setupsieverules.html
 roundcubemail/plugins/sieverules/skins/larry/templates/sieverules.html
+roundcubemail/plugins/sieverules/skins/larry/tick.png