diff --git a/net/p5-POE-Component-Jabber/Makefile b/net/p5-POE-Component-Jabber/Makefile
index d74e6a8ba279..f07ae902d069 100644
--- a/net/p5-POE-Component-Jabber/Makefile
+++ b/net/p5-POE-Component-Jabber/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	POE-Component-Jabber
-PORTVERSION=	2.03
+PORTVERSION=	3.00
 CATEGORIES=	net devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -27,23 +27,19 @@ CONFIGURE_ARGS=	</dev/null
 
 PORTEXAMPLES=	*
 MAN3=		POE::Component::Jabber.3 \
-		POE::Component::Jabber::Error.3 \
+		POE::Component::Jabber::Events.3 \
 		POE::Component::Jabber::J14.3 \
 		POE::Component::Jabber::J2.3 \
 		POE::Component::Jabber::Legacy.3 \
 		POE::Component::Jabber::Protocol.3 \
 		POE::Component::Jabber::ProtocolFactory.3 \
-		POE::Component::Jabber::Status.3 \
-		POE::Component::Jabber::Utility::ClientHandle.3 \
-		POE::Component::Jabber::Utility::SSLify.3 \
-		POE::Component::Jabber::Utility::ServerHandle.3 \
 		POE::Component::Jabber::XMPP.3
 
 post-install:
 .ifndef(NOPORTEXAMPLES)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}/
+	@${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${EXAMPLESDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/p5-POE-Component-Jabber/distinfo b/net/p5-POE-Component-Jabber/distinfo
index d0ca5cd8e15d..5ab35ca37540 100644
--- a/net/p5-POE-Component-Jabber/distinfo
+++ b/net/p5-POE-Component-Jabber/distinfo
@@ -1,3 +1,3 @@
-MD5 (POE-Component-Jabber-2.03.tar.gz) = 523d2e37c8dc1eac4605059f6627baff
-SHA256 (POE-Component-Jabber-2.03.tar.gz) = 22aecf8e76685085b4a73a43523bfedcfe6ec4321f47db71d8fed6e7feac3b53
-SIZE (POE-Component-Jabber-2.03.tar.gz) = 37080
+MD5 (POE-Component-Jabber-3.00.tar.gz) = 821500f5938b30db17cb496ae4006d73
+SHA256 (POE-Component-Jabber-3.00.tar.gz) = a3f5bd49716335dd58d3ee882c5c18461d06a46781bb0c1a59db063f0e961f59
+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 959961a1add8..c0c01667c25f 100644
--- a/net/p5-POE-Component-Jabber/pkg-plist
+++ b/net/p5-POE-Component-Jabber/pkg-plist
@@ -1,16 +1,13 @@
-%%SITE_PERL%%/POE/Component/Jabber.pm
 %%SITE_PERL%%/POE/Component/Jabber/J14.pm
-%%SITE_PERL%%/POE/Component/Jabber/J2.pm
 %%SITE_PERL%%/POE/Component/Jabber/Legacy.pm
 %%SITE_PERL%%/POE/Component/Jabber/Protocol.pm
-%%SITE_PERL%%/POE/Component/Jabber/ProtocolFactory.pm
-%%SITE_PERL%%/POE/Component/Jabber/Status.pm
 %%SITE_PERL%%/POE/Component/Jabber/XMPP.pm
-%%SITE_PERL%%/POE/Component/Jabber/Error.pm
-%%SITE_PERL%%/POE/Component/Jabber/Utility/ClientHandle.pm
-%%SITE_PERL%%/POE/Component/Jabber/Utility/SSLify.pm
-%%SITE_PERL%%/POE/Component/Jabber/Utility/ServerHandle.pm
+%%SITE_PERL%%/POE/Component/Jabber/ProtocolFactory.pm
+%%SITE_PERL%%/POE/Component/Jabber/J2.pm
+%%SITE_PERL%%/POE/Component/Jabber/Events.pm
+%%SITE_PERL%%/POE/Component/Jabber.pm
 @dirrmtry %%SITE_PERL%%/POE/Component/Jabber/Utility
 @dirrmtry %%SITE_PERL%%/POE/Component/Jabber
+@dirrmtry %%SITE_PERL%%/POE/Component/Jabber
 @dirrmtry %%SITE_PERL%%/POE/Component
 @dirrmtry %%SITE_PERL%%/POE