diff --git a/devel/p5-Module-Pluggable/Makefile b/devel/p5-Module-Pluggable/Makefile
index 69799175bd73..ad71a20ab2bf 100644
--- a/devel/p5-Module-Pluggable/Makefile
+++ b/devel/p5-Module-Pluggable/Makefile
@@ -7,17 +7,17 @@
 
 PORTNAME=	Module-Pluggable
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Module
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Automatically give your module the ability to have plugins
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	p5-Class-Inspector>0:${PORTSDIR}/devel/p5-Class-Inspector \
+		p5-PathTools>=3.0:${PORTSDIR}/devel/p5-PathTools
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_MODBUILD=	yes