diff --git a/lang/p5-Test-XPath/Makefile b/lang/p5-Test-XPath/Makefile
index 6c2c3f809a35..68394f313156 100644
--- a/lang/p5-Test-XPath/Makefile
+++ b/lang/p5-Test-XPath/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Test-XPath
-PORTVERSION=	0.13
+PORTVERSION=	0.15
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DWHEELER
@@ -15,12 +15,28 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	milki@rescomp.berkeley.edu
 COMMENT=	Test XML and HTML content and structure with XPath expressions
 
-BUILD_DEPENDS=	p5-Test-Simple>=0.70:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Module-Build>=0.30:${PORTSDIR}/devel/p5-Module-Build
-RUN_DEPENDS=	p5-XML-LibXML>=1.69:${PORTSDIR}/textproc/p5-XML-LibXML
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
 
-PERL_MODBUILD=	YES
+RUN_DEPENDS=	p5-XML-LibXML>=1.70:${PORTSDIR}/textproc/p5-XML-LibXML
+
+TEST_DEPENDS=	p5-Test-XPath>=0:${PORTSDIR}/lang/p5-Test-XPath
+
+PERL_MODBUILD=	0.30+
 
 MAN3=	Test::XPath.3
 
+OPTIONS=	CSS "Include CSS selectors" Off \
+			PODT "Include Pod package test dependencies" Off
+
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_CSS)
+RUN_DEPENDS+=	p5-HTML-Selector-XPath>=0.06:${PORTSDIR}/www/p5-HTML-Selector-XPath
+.endif
+
+.if !defined(WITHOUT_PODT)
+TEST_DEPENDS+=	p5-Test-Pod>=1.20:${PORTSDIR}/devel/p5-Test-Pod \
+	p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage
+.endif
 .include <bsd.port.mk>
diff --git a/lang/p5-Test-XPath/distinfo b/lang/p5-Test-XPath/distinfo
index 6e9721fa5e49..7fdc5ba5a9be 100644
--- a/lang/p5-Test-XPath/distinfo
+++ b/lang/p5-Test-XPath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Test-XPath-0.13.tar.gz) = f31b772ba943e0322dc1f3915c9b8bca8a92831b442a2c3471f9ccc8151efd1a
-SIZE (Test-XPath-0.13.tar.gz) = 14285
+SHA256 (Test-XPath-0.15.tar.gz) = 0c59ed30f0a0fa8d944edf3f2d032963b9aa4bbce4655be54f4a3ed6aecc5d11
+SIZE (Test-XPath-0.15.tar.gz) = 16108