diff --git a/net/p5-POE-Component-Jabber/Makefile b/net/p5-POE-Component-Jabber/Makefile
index cce50ce07d3..de6d031083d 100644
--- a/net/p5-POE-Component-Jabber/Makefile
+++ b/net/p5-POE-Component-Jabber/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2008/10/02 19:18:33 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2009/03/23 08:42:04 jasper Exp $
 
 COMMENT=		POE Component for communicating over Jabber
 
-DISTNAME=		POE-Component-Jabber-2.03
+DISTNAME=		POE-Component-Jabber-3.00
 CATEGORIES=		net
 
 # GPLv2
@@ -16,10 +16,10 @@ MODULES=		cpan
 CONFIGURE_STYLE=	modbuild
 
 RUN_DEPENDS=		::devel/p5-Filter-Template \
+			::devel/p5-POE-Component-PubSub \
 			::security/p5-Authen-SASL \
 			:p5-Net-SSLeay->=1.35:security/p5-Net_SSLeay \
-			::security/p5-POE-Component-SSLify \
-			::textproc/p5-POE-Filter-XML
-BUILD_DEPENDS=		${RUN_DEPENDS}
+			:p5-POE-Component-SSLify->=0.15:security/p5-POE-Component-SSLify \
+			:p5-POE-Filter-XML->=0.35:textproc/p5-POE-Filter-XML
 
 .include <bsd.port.mk>
diff --git a/net/p5-POE-Component-Jabber/distinfo b/net/p5-POE-Component-Jabber/distinfo
index 6ba64d0885d..8ca3ec93d32 100644
--- a/net/p5-POE-Component-Jabber/distinfo
+++ b/net/p5-POE-Component-Jabber/distinfo
@@ -1,5 +1,5 @@
-MD5 (POE-Component-Jabber-2.03.tar.gz) = Uj0uN8jcHqxGBQWfZie6/w==
-RMD160 (POE-Component-Jabber-2.03.tar.gz) = Y7RWhGjFpNE3uiT+XWMaXQe8XHg=
-SHA1 (POE-Component-Jabber-2.03.tar.gz) = SiNbKRqzKZv0gSNThWsf105Stdg=
-SHA256 (POE-Component-Jabber-2.03.tar.gz) = Iq7PjnZoUIW0pzpDUjv+3P5uxDIfR9tx2P7W5/6sO1M=
-SIZE (POE-Component-Jabber-2.03.tar.gz) = 37080
+MD5 (POE-Component-Jabber-3.00.tar.gz) = ghUA9ZOLMNsXy0lq5ABtcw==
+RMD160 (POE-Component-Jabber-3.00.tar.gz) = yOWVQsz5JjzlMqy9ul9/ObOwJvg=
+SHA1 (POE-Component-Jabber-3.00.tar.gz) = M+GzRQmbJR0ytDyN4rZc6iIjmBQ=
+SHA256 (POE-Component-Jabber-3.00.tar.gz) = o/W9SXFjNd1Y0+6ILFwYRh0GpGeBuwwaWdsGPw6WH1k=
+SIZE (POE-Component-Jabber-3.00.tar.gz) = 32155
diff --git a/net/p5-POE-Component-Jabber/pkg/PLIST b/net/p5-POE-Component-Jabber/pkg/PLIST
index 41d99f11aa6..b97cf0d2424 100644
--- a/net/p5-POE-Component-Jabber/pkg/PLIST
+++ b/net/p5-POE-Component-Jabber/pkg/PLIST
@@ -1,27 +1,18 @@
-@comment $OpenBSD: PLIST,v 1.3 2008/10/02 19:18:33 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.4 2009/03/23 08:42:04 jasper Exp $
 ${P5SITE}/POE/Component/Jabber/
 ${P5SITE}/POE/Component/Jabber.pm
-${P5SITE}/POE/Component/Jabber/Error.pm
+${P5SITE}/POE/Component/Jabber/Events.pm
 ${P5SITE}/POE/Component/Jabber/J14.pm
 ${P5SITE}/POE/Component/Jabber/J2.pm
 ${P5SITE}/POE/Component/Jabber/Legacy.pm
 ${P5SITE}/POE/Component/Jabber/Protocol.pm
 ${P5SITE}/POE/Component/Jabber/ProtocolFactory.pm
-${P5SITE}/POE/Component/Jabber/Status.pm
-${P5SITE}/POE/Component/Jabber/Utility/
-${P5SITE}/POE/Component/Jabber/Utility/ClientHandle.pm
-${P5SITE}/POE/Component/Jabber/Utility/SSLify.pm
-${P5SITE}/POE/Component/Jabber/Utility/ServerHandle.pm
 ${P5SITE}/POE/Component/Jabber/XMPP.pm
 @man man/man3p/POE::Component::Jabber.3p
-@man man/man3p/POE::Component::Jabber::Error.3p
+@man man/man3p/POE::Component::Jabber::Events.3p
 @man man/man3p/POE::Component::Jabber::J14.3p
 @man man/man3p/POE::Component::Jabber::J2.3p
 @man man/man3p/POE::Component::Jabber::Legacy.3p
 @man man/man3p/POE::Component::Jabber::Protocol.3p
 @man man/man3p/POE::Component::Jabber::ProtocolFactory.3p
-@man man/man3p/POE::Component::Jabber::Status.3p
-@man man/man3p/POE::Component::Jabber::Utility::ClientHandle.3p
-@man man/man3p/POE::Component::Jabber::Utility::SSLify.3p
-@man man/man3p/POE::Component::Jabber::Utility::ServerHandle.3p
 @man man/man3p/POE::Component::Jabber::XMPP.3p