diff --git a/devel/p5-Test-Base/Makefile b/devel/p5-Test-Base/Makefile
index 1243b20ddc0c..299aa98adfb6 100644
--- a/devel/p5-Test-Base/Makefile
+++ b/devel/p5-Test-Base/Makefile
@@ -7,19 +7,16 @@
 
 PORTNAME=	Test-Base
 PORTVERSION=	0.54
+PORTREVISION=	1
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Test
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Test::Base - A Data Driven Testing Framework
 
-BUILD_DEPENDS=	\
-		p5-Spiffy>=0.30:${PORTSDIR}/devel/p5-Spiffy \
-		p5-MIME-Base64>0:${PORTSDIR}/converters/p5-MIME-Base64 \
-		p5-Test-Simple>=0.62:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	p5-Spiffy>=0.30:${PORTSDIR}/devel/p5-Spiffy
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
@@ -27,4 +24,15 @@ MAN3=	Test::Base.3 \
 	Test::Base::Filter.3 \
 	Module::Install::TestBase.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500703
+RUN_DEPENDS+=	p5-Filter>=0:${PORTSDIR}/devel/p5-Filter \
+		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+.endif
+
+.if ${PERL_LEVEL} < 500808
+RUN_DEPENDS+=	p5-Test-Simple>=0.62:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>