diff --git a/mail/evolution-plugin-rss/Makefile b/mail/evolution-plugin-rss/Makefile
index 987401cb0ed..f47decdecee 100644
--- a/mail/evolution-plugin-rss/Makefile
+++ b/mail/evolution-plugin-rss/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2008/05/13 14:17:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2008/06/02 16:50:58 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,8 +6,9 @@ COMMENT=		RSS-reader plugin for GNOME
 
 GNOME_PROJECT=		evolution-rss
 GNOME_VERSION=		0.0.8
-PKGNAME=		evolution-plugin-rss-${GNOME_VERSION}
+PKGNAME=		evolution-plugin-rss-${GNOME_VERSION}p0
 CATEGORIES=    		mail
+EVO_VERSION=		2.22
 
 HOMEPAGE=		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 
@@ -26,7 +27,7 @@ MODULES=		devel/gettext \
 			x11/gnome
 
 BUILD_DEPENDS=		${RUN_DEPENDS}
-RUN_DEPENDS=		::mail/evolution
+RUN_DEPENDS=		:evolution->=2.22.2:mail/evolution
 LIB_DEPENDS=		dbus-glib-1::x11/dbus-glib
 
 USE_X11=		Yes
@@ -42,4 +43,6 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
 
+SUBST_VARS=		EVO_VERSION
+
 .include <bsd.port.mk>
diff --git a/mail/evolution-plugin-rss/pkg/PLIST b/mail/evolution-plugin-rss/pkg/PLIST
index 8995a2deda0..d1ca9c4dfb5 100644
--- a/mail/evolution-plugin-rss/pkg/PLIST
+++ b/mail/evolution-plugin-rss/pkg/PLIST
@@ -1,14 +1,20 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/13 14:17:15 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2008/06/02 16:50:58 jasper Exp $
 bin/evolution-import-rss
-lib/bonobo/servers/GNOME_Evolution_RSS_2.12.server
-lib/evolution/2.12/plugins/liborg-gnome-evolution-rss.a
-lib/evolution/2.12/plugins/liborg-gnome-evolution-rss.la
-lib/evolution/2.12/plugins/liborg-gnome-evolution-rss.so
-lib/evolution/2.12/plugins/org-gnome-evolution-rss.eplug
-lib/evolution/2.12/plugins/org-gnome-evolution-rss.xml
-share/evolution/2.12/errors/org-gnome-evolution-rss.error
-share/evolution/2.12/glade/rss-ui.glade
-share/evolution/2.12/images/rss.png
+lib/bonobo/servers/GNOME_Evolution_RSS_${EVO_VERSION}.server
+lib/evolution/${EVO_VERSION}/
+lib/evolution/${EVO_VERSION}/plugins/
+lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.a
+lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.la
+lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.so
+lib/evolution/${EVO_VERSION}/plugins/org-gnome-evolution-rss.eplug
+lib/evolution/${EVO_VERSION}/plugins/org-gnome-evolution-rss.xml
+share/evolution/${EVO_VERSION}/
+share/evolution/${EVO_VERSION}/errors/
+share/evolution/${EVO_VERSION}/errors/org-gnome-evolution-rss.error
+share/evolution/${EVO_VERSION}/glade/
+share/evolution/${EVO_VERSION}/glade/rss-ui.glade
+share/evolution/${EVO_VERSION}/images/
+share/evolution/${EVO_VERSION}/images/rss.png
 share/locale/en_AU/LC_MESSAGES/evolution-rss.mo
 share/locale/ro/LC_MESSAGES/evolution-rss.mo
 share/locale/sv/LC_MESSAGES/evolution-rss.mo