diff --git a/devel/p5-Any-Moose/Makefile b/devel/p5-Any-Moose/Makefile
index 1a4b334f6cfe..abcee69f4df5 100644
--- a/devel/p5-Any-Moose/Makefile
+++ b/devel/p5-Any-Moose/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Any-Moose
-PORTVERSION=	0.15
+PORTVERSION=	0.17
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SARTAK
@@ -22,16 +22,16 @@ MAN3=	Any::Moose.3
 OPTIONS=	MOOSE "Use Moose" off \
 		MOUSE "Use Mouse" on
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_MOOSE)
+BUILD_DEPENDS+=	p5-Moose>0:${PORTSDIR}/devel/p5-Moose
 RUN_DEPENDS+=	p5-Moose>0:${PORTSDIR}/devel/p5-Moose
 .endif
 
 .if defined(WITH_MOUSE)
+BUILD_DEPENDS+=	p5-Mouse>=0.40:${PORTSDIR}/devel/p5-Mouse
 RUN_DEPENDS+=	p5-Mouse>=0.40:${PORTSDIR}/devel/p5-Mouse
 .endif
 
-BUILD_DEPENDS=	${RUN_DEPENDS}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Any-Moose/distinfo b/devel/p5-Any-Moose/distinfo
index 39766d5af180..f3a63c8b54ea 100644
--- a/devel/p5-Any-Moose/distinfo
+++ b/devel/p5-Any-Moose/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Any-Moose-0.15.tar.gz) = b43d4ed68242c5ed29cb35a8d5f4ef5e536abde421c83c663af4be249cedf315
-SIZE (Any-Moose-0.15.tar.gz) = 14359
+SHA256 (Any-Moose-0.17.tar.gz) = a9d229f0b6bfa22962865f3606c3d95b11fb3bd130d18793c2a2a81cc9caafde
+SIZE (Any-Moose-0.17.tar.gz) = 15148