diff --git a/devel/p5-Sub-Install/Makefile b/devel/p5-Sub-Install/Makefile
index 31a640101d76..b08a97a306d3 100644
--- a/devel/p5-Sub-Install/Makefile
+++ b/devel/p5-Sub-Install/Makefile
@@ -7,20 +7,24 @@
 
 PORTNAME=	Sub-Install
 PORTVERSION=	0.924
+PORTREVISION=	1
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Sub
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Install subroutines into packages easily
 
-BUILD_DEPENDS=	${RUN_DEPENDS} \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
-
-PERL_CONFIGURE=	5.8.0+
+PERL_CONFIGURE=	yes
 
 MAN3=	Sub::Install.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500703
+BUILD_DEPENDS=	${RUN_DEPENDS} \
+		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
+.endif
+
+.include <bsd.port.post.mk>