diff --git a/misc/p5-Business-ISBN/Makefile b/misc/p5-Business-ISBN/Makefile
index 337e5e457fee..1c1819cfbc89 100644
--- a/misc/p5-Business-ISBN/Makefile
+++ b/misc/p5-Business-ISBN/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Business-ISBN
-PORTVERSION=	2.06
+PORTVERSION=	2.07
 CATEGORIES=	misc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -24,16 +24,9 @@ XISBN_DESC=	xISBN support
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MBARCODE}
-BUILD_DEPENDS+=	p5-GD-Barcode>=0:${PORTSDIR}/graphics/p5-GD-Barcode
-RUN_DEPENDS+=	p5-GD-Barcode>=0:${PORTSDIR}/graphics/p5-GD-Barcode
-.endif
-
-.if ${PORT_OPTIONS:MXISBN}
-BUILD_DEPENDS+=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS+=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-.endif
+BARCODE_BUILD_DEPENDS=	p5-GD-Barcode>=0:${PORTSDIR}/graphics/p5-GD-Barcode
+BARCODE_RUN_DEPENDS=	p5-GD-Barcode>=0:${PORTSDIR}/graphics/p5-GD-Barcode
+XISBN_BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+XISBN_RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 .include <bsd.port.mk>
diff --git a/misc/p5-Business-ISBN/distinfo b/misc/p5-Business-ISBN/distinfo
index 8243cc5638cb..425b740f68eb 100644
--- a/misc/p5-Business-ISBN/distinfo
+++ b/misc/p5-Business-ISBN/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Business-ISBN-2.06.tar.gz) = cafff48f2f3a060ff0b1c35ebc3c239e507b351e45ec922e5ffab4577cab1eb6
-SIZE (Business-ISBN-2.06.tar.gz) = 355843
+SHA256 (Business-ISBN-2.07.tar.gz) = 4c11279580872bf3cc7176bb75c25b165d4b59a2828fc43d9a355cec3d0a45ff
+SIZE (Business-ISBN-2.07.tar.gz) = 355865