diff --git a/net-im/p5-Net-Jabber/Makefile b/net-im/p5-Net-Jabber/Makefile
index 7bee307754c3..ec6a52e4fdd9 100644
--- a/net-im/p5-Net-Jabber/Makefile
+++ b/net-im/p5-Net-Jabber/Makefile
@@ -6,72 +6,31 @@
 #
 
 PORTNAME=	Net-Jabber
-PORTVERSION=	1.0021
+PORTVERSION=	1.0022
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	leeym@cae.ce.ntu.edu.tw
+MAINTAINER=	ports@FreeBSD.org
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Stream.pm:${PORTSDIR}/textproc/p5-XML-Stream \
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Stream.pm:${PORTSDIR}/textproc/p5-XML-Stream \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		Net::Jabber.3 \
-		Net::Jabber::Client.3 \
-		Net::Jabber::Component.3 \
-		Net::Jabber::Data.3 \
-		Net::Jabber::Data::Auth.3 \
-		Net::Jabber::Debug.3 \
-		Net::Jabber::Dialback.3 \
-		Net::Jabber::Dialback::Result.3 \
-		Net::Jabber::Dialback::Verify.3 \
-		Net::Jabber::IQ.3 \
-		Net::Jabber::JID.3 \
-		Net::Jabber::Key.3 \
-		Net::Jabber::Log.3 \
-		Net::Jabber::Message.3 \
-		Net::Jabber::Presence.3 \
-		Net::Jabber::Protocol.3 \
-		Net::Jabber::Query.3 \
-		Net::Jabber::Query::Agent.3 \
-		Net::Jabber::Query::Agents.3 \
-		Net::Jabber::Query::Auth.3 \
-		Net::Jabber::Query::AutoUpdate.3 \
-		Net::Jabber::Query::AutoUpdate::Release.3 \
-		Net::Jabber::Query::Filter.3 \
-		Net::Jabber::Query::Filter::Rule.3 \
-		Net::Jabber::Query::Fneg.3 \
-		Net::Jabber::Query::Oob.3 \
-		Net::Jabber::Query::Register.3 \
-		Net::Jabber::Query::Roster.3 \
-		Net::Jabber::Query::Roster::Item.3 \
-		Net::Jabber::Query::Search.3 \
-		Net::Jabber::Query::Search::Item.3 \
-		Net::Jabber::Query::Time.3 \
-		Net::Jabber::Query::Version.3 \
-		Net::Jabber::Server.3 \
-		Net::Jabber::X.3 \
-		Net::Jabber::X::AutoUpdate.3 \
-		Net::Jabber::X::Delay.3 \
-		Net::Jabber::X::Encrypted.3 \
-		Net::Jabber::X::Form.3 \
-		Net::Jabber::X::Form::Field.3 \
-		Net::Jabber::X::Form::Field::Option.3 \
-		Net::Jabber::X::GC.3 \
-		Net::Jabber::X::Ident.3 \
-		Net::Jabber::X::Oob.3 \
-		Net::Jabber::X::ReplyPres.3 \
-		Net::Jabber::X::Roster.3 \
-		Net::Jabber::X::Roster::Item.3 \
-		Net::Jabber::X::SXPM.3 \
-		Net::Jabber::X::SXPM::Map.3 \
-		Net::Jabber::X::Signed.3 \
+MAN3=		Net::Jabber.3 Net::Jabber::Client.3 Net::Jabber::Component.3 \
+		Net::Jabber::Data.3 Net::Jabber::Debug.3 \
+		Net::Jabber::Dialback.3 Net::Jabber::Dialback::Result.3 \
+		Net::Jabber::Dialback::Verify.3 Net::Jabber::IQ.3 \
+		Net::Jabber::JID.3 Net::Jabber::Key.3 Net::Jabber::Log.3 \
+		Net::Jabber::Message.3 Net::Jabber::Namespaces.3 \
+		Net::Jabber::Presence.3 Net::Jabber::Protocol.3 \
+		Net::Jabber::Query.3 Net::Jabber::Server.3 Net::Jabber::X.3 \
 		Net::Jabber::XDB.3
 
 .include <bsd.port.mk>
diff --git a/net-im/p5-Net-Jabber/distinfo b/net-im/p5-Net-Jabber/distinfo
index fc08b1d70ed4..851c76fd780c 100644
--- a/net-im/p5-Net-Jabber/distinfo
+++ b/net-im/p5-Net-Jabber/distinfo
@@ -1 +1 @@
-MD5 (Net-Jabber-1.0021.tar.gz) = dfad3decf35b4ed5090e3f57b8adb7c9
+MD5 (Net-Jabber-1.0022.tar.gz) = f21fd22ca01b06ab3fd4fc24de2f6f05
diff --git a/net-im/p5-Net-Jabber/pkg-plist b/net-im/p5-Net-Jabber/pkg-plist
index e3a5b5f52057..3c91235f8800 100644
--- a/net-im/p5-Net-Jabber/pkg-plist
+++ b/net-im/p5-Net-Jabber/pkg-plist
@@ -2,7 +2,6 @@ lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Client.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Component.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data/Auth.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Debug.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback/Result.pm
@@ -12,57 +11,16 @@ lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/JID.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Key.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Log.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Message.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Namespaces.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Presence.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Protocol.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Agent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Agents.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Auth.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/AutoUpdate.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/AutoUpdate/Release.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Filter/Rule.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Fneg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Oob.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Register.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Roster.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Roster/Item.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Search.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Search/Item.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Time.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Version.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Server.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/AutoUpdate.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Delay.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Encrypted.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form/Field.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form/Field/Option.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/GC.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Ident.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Oob.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/ReplyPres.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Roster.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Roster/Item.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/SXPM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/SXPM/Map.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Signed.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/XDB.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/SXPM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Roster
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form/Field
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Search
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Roster
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Filter
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/AutoUpdate
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-Jabber/Makefile b/net/p5-Net-Jabber/Makefile
index 7bee307754c3..ec6a52e4fdd9 100644
--- a/net/p5-Net-Jabber/Makefile
+++ b/net/p5-Net-Jabber/Makefile
@@ -6,72 +6,31 @@
 #
 
 PORTNAME=	Net-Jabber
-PORTVERSION=	1.0021
+PORTVERSION=	1.0022
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	leeym@cae.ce.ntu.edu.tw
+MAINTAINER=	ports@FreeBSD.org
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Stream.pm:${PORTSDIR}/textproc/p5-XML-Stream \
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Stream.pm:${PORTSDIR}/textproc/p5-XML-Stream \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		Net::Jabber.3 \
-		Net::Jabber::Client.3 \
-		Net::Jabber::Component.3 \
-		Net::Jabber::Data.3 \
-		Net::Jabber::Data::Auth.3 \
-		Net::Jabber::Debug.3 \
-		Net::Jabber::Dialback.3 \
-		Net::Jabber::Dialback::Result.3 \
-		Net::Jabber::Dialback::Verify.3 \
-		Net::Jabber::IQ.3 \
-		Net::Jabber::JID.3 \
-		Net::Jabber::Key.3 \
-		Net::Jabber::Log.3 \
-		Net::Jabber::Message.3 \
-		Net::Jabber::Presence.3 \
-		Net::Jabber::Protocol.3 \
-		Net::Jabber::Query.3 \
-		Net::Jabber::Query::Agent.3 \
-		Net::Jabber::Query::Agents.3 \
-		Net::Jabber::Query::Auth.3 \
-		Net::Jabber::Query::AutoUpdate.3 \
-		Net::Jabber::Query::AutoUpdate::Release.3 \
-		Net::Jabber::Query::Filter.3 \
-		Net::Jabber::Query::Filter::Rule.3 \
-		Net::Jabber::Query::Fneg.3 \
-		Net::Jabber::Query::Oob.3 \
-		Net::Jabber::Query::Register.3 \
-		Net::Jabber::Query::Roster.3 \
-		Net::Jabber::Query::Roster::Item.3 \
-		Net::Jabber::Query::Search.3 \
-		Net::Jabber::Query::Search::Item.3 \
-		Net::Jabber::Query::Time.3 \
-		Net::Jabber::Query::Version.3 \
-		Net::Jabber::Server.3 \
-		Net::Jabber::X.3 \
-		Net::Jabber::X::AutoUpdate.3 \
-		Net::Jabber::X::Delay.3 \
-		Net::Jabber::X::Encrypted.3 \
-		Net::Jabber::X::Form.3 \
-		Net::Jabber::X::Form::Field.3 \
-		Net::Jabber::X::Form::Field::Option.3 \
-		Net::Jabber::X::GC.3 \
-		Net::Jabber::X::Ident.3 \
-		Net::Jabber::X::Oob.3 \
-		Net::Jabber::X::ReplyPres.3 \
-		Net::Jabber::X::Roster.3 \
-		Net::Jabber::X::Roster::Item.3 \
-		Net::Jabber::X::SXPM.3 \
-		Net::Jabber::X::SXPM::Map.3 \
-		Net::Jabber::X::Signed.3 \
+MAN3=		Net::Jabber.3 Net::Jabber::Client.3 Net::Jabber::Component.3 \
+		Net::Jabber::Data.3 Net::Jabber::Debug.3 \
+		Net::Jabber::Dialback.3 Net::Jabber::Dialback::Result.3 \
+		Net::Jabber::Dialback::Verify.3 Net::Jabber::IQ.3 \
+		Net::Jabber::JID.3 Net::Jabber::Key.3 Net::Jabber::Log.3 \
+		Net::Jabber::Message.3 Net::Jabber::Namespaces.3 \
+		Net::Jabber::Presence.3 Net::Jabber::Protocol.3 \
+		Net::Jabber::Query.3 Net::Jabber::Server.3 Net::Jabber::X.3 \
 		Net::Jabber::XDB.3
 
 .include <bsd.port.mk>
diff --git a/net/p5-Net-Jabber/distinfo b/net/p5-Net-Jabber/distinfo
index fc08b1d70ed4..851c76fd780c 100644
--- a/net/p5-Net-Jabber/distinfo
+++ b/net/p5-Net-Jabber/distinfo
@@ -1 +1 @@
-MD5 (Net-Jabber-1.0021.tar.gz) = dfad3decf35b4ed5090e3f57b8adb7c9
+MD5 (Net-Jabber-1.0022.tar.gz) = f21fd22ca01b06ab3fd4fc24de2f6f05
diff --git a/net/p5-Net-Jabber/pkg-plist b/net/p5-Net-Jabber/pkg-plist
index e3a5b5f52057..3c91235f8800 100644
--- a/net/p5-Net-Jabber/pkg-plist
+++ b/net/p5-Net-Jabber/pkg-plist
@@ -2,7 +2,6 @@ lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Client.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Component.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data/Auth.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Debug.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback/Result.pm
@@ -12,57 +11,16 @@ lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/JID.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Key.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Log.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Message.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Namespaces.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Presence.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Protocol.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Agent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Agents.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Auth.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/AutoUpdate.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/AutoUpdate/Release.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Filter/Rule.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Fneg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Oob.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Register.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Roster.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Roster/Item.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Search.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Search/Item.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Time.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Version.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Server.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/AutoUpdate.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Delay.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Encrypted.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form/Field.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form/Field/Option.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/GC.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Ident.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Oob.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/ReplyPres.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Roster.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Roster/Item.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/SXPM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/SXPM/Map.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Signed.pm
 lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/XDB.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/SXPM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Roster
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form/Field
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X/Form
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Search
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Roster
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/Filter
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query/AutoUpdate
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true