diff --git a/net/p5-XML-Compile-SOAP-Daemon/Makefile b/net/p5-XML-Compile-SOAP-Daemon/Makefile
index c7278dada01f..37920dbfcb1f 100644
--- a/net/p5-XML-Compile-SOAP-Daemon/Makefile
+++ b/net/p5-XML-Compile-SOAP-Daemon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	XML-Compile-SOAP-Daemon
-PORTVERSION=	2.06
+PORTVERSION=	3.00
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,19 +14,19 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Base class for SOAP message servers
 
-BUILD_DEPENDS=	p5-Log-Report>=0.90:${PORTSDIR}/devel/p5-Log-Report \
-		p5-Net-Server>=0.97:${PORTSDIR}/net/p5-Net-Server \
+RUN_DEPENDS=	p5-Log-Report>=0.90:${PORTSDIR}/devel/p5-Log-Report \
 		p5-XML-Compile-Cache>=0.98:${PORTSDIR}/textproc/p5-XML-Compile-Cache \
 		p5-XML-Compile-SOAP-WSA>=0.12:${PORTSDIR}/net/p5-XML-Compile-SOAP-WSA \
 		p5-XML-Compile-SOAP>=2.20:${PORTSDIR}/net/p5-XML-Compile-SOAP \
-		p5-XML-Compile>=1.2:${PORTSDIR}/textproc/p5-XML-Compile \
-		p5-libwww>=5.803:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	${BUILD_DEPENDS}
+		p5-XML-Compile>=1.2:${PORTSDIR}/textproc/p5-XML-Compile
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=	XML::Compile::SOAP::Daemon.3 \
-	XML::Compile::SOAP::HTTPDaemon.3
+	XML::Compile::SOAP::Daemon::CGI.3 \
+	XML::Compile::SOAP::Daemon::LWPutil.3 \
+	XML::Compile::SOAP::Daemon::NetServer.3
 
 post-patch:
 	@${PERL} -pi -e '$$_="" if m/Test::|::Tester/' ${WRKSRC}/Makefile.PL
diff --git a/net/p5-XML-Compile-SOAP-Daemon/distinfo b/net/p5-XML-Compile-SOAP-Daemon/distinfo
index 277193c691d9..1452d389d50f 100644
--- a/net/p5-XML-Compile-SOAP-Daemon/distinfo
+++ b/net/p5-XML-Compile-SOAP-Daemon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (XML-Compile-SOAP-Daemon-2.06.tar.gz) = 8c6d52b8c80715d5018e1c79134e25813b01ab1384de4f2b0bd748fc389b92b6
-SIZE (XML-Compile-SOAP-Daemon-2.06.tar.gz) = 26750
+SHA256 (XML-Compile-SOAP-Daemon-3.00.tar.gz) = 26779f489731459c44c8f4fa6e1e8f1aebdd4810e2a4cf905717bcfd5f3977b9
+SIZE (XML-Compile-SOAP-Daemon-3.00.tar.gz) = 31713
diff --git a/net/p5-XML-Compile-SOAP-Daemon/pkg-plist b/net/p5-XML-Compile-SOAP-Daemon/pkg-plist
index 2a5cc6787eb3..f4b22e1145dc 100644
--- a/net/p5-XML-Compile-SOAP-Daemon/pkg-plist
+++ b/net/p5-XML-Compile-SOAP-Daemon/pkg-plist
@@ -1,12 +1,18 @@
 %%SITE_PERL%%/XML/Compile/SOAP/Daemon.pm
 %%SITE_PERL%%/XML/Compile/SOAP/Daemon.pod
+%%SITE_PERL%%/XML/Compile/SOAP/Daemon/CGI.pm
+%%SITE_PERL%%/XML/Compile/SOAP/Daemon/CGI.pod
+%%SITE_PERL%%/XML/Compile/SOAP/Daemon/LWPutil.pm
+%%SITE_PERL%%/XML/Compile/SOAP/Daemon/LWPutil.pod
+%%SITE_PERL%%/XML/Compile/SOAP/Daemon/NetServer.pm
+%%SITE_PERL%%/XML/Compile/SOAP/Daemon/NetServer.pod
 %%SITE_PERL%%/XML/Compile/SOAP/HTTPDaemon.pm
-%%SITE_PERL%%/XML/Compile/SOAP/HTTPDaemon.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP/Daemon/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP/Daemon
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile/SOAP
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Compile
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML/Compile/SOAP/Daemon
 @dirrmtry %%SITE_PERL%%/XML/Compile/SOAP
 @dirrmtry %%SITE_PERL%%/XML/Compile
 @dirrmtry %%SITE_PERL%%/XML