diff --git a/net/p5-Net-Appliance-Phrasebook/Makefile b/net/p5-Net-Appliance-Phrasebook/Makefile
index 6e7315dc019a..ad7602622cf9 100644
--- a/net/p5-Net-Appliance-Phrasebook/Makefile
+++ b/net/p5-Net-Appliance-Phrasebook/Makefile
@@ -6,26 +6,26 @@
 #
 
 PORTNAME=	Net-Appliance-Phrasebook
-PORTVERSION=	1.8
+PORTVERSION=	2.103.642
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Network appliance command-line phrasebook
 
-BUILD_DEPENDS=	${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
-		${SITE_PERL}/Test/Pod/Coverage.pm:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		${SITE_PERL}/Data/Phrasebook.pm:${PORTSDIR}/textproc/p5-Data-Phrasebook \
-		${SITE_PERL}/Test/Pod.pm:${PORTSDIR}/devel/p5-Test-Pod \
-		${SITE_PERL}/Data/Phrasebook/Loader/YAML.pm:${PORTSDIR}/textproc/p5-Data-Phrasebook-Loader-YAML \
-		${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		${SITE_PERL}/${PERL_ARCH}/List/MoreUtils.pm:${PORTSDIR}/lang/p5-List-MoreUtils
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
+		p5-Data-Phrasebook>=0:${PORTSDIR}/textproc/p5-Data-Phrasebook \
+		p5-Data-Phrasebook-Loader-YAML>=0:${PORTSDIR}/textproc/p5-Data-Phrasebook-Loader-YAML \
+		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+RUN_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
+		p5-Data-Phrasebook>=0:${PORTSDIR}/textproc/p5-Data-Phrasebook \
+		p5-Data-Phrasebook-Loader-YAML>=0:${PORTSDIR}/textproc/p5-Data-Phrasebook-Loader-YAML \
+		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
 
 PERL_CONFIGURE=	yes
 
-MAN3=	Net::Appliance::Phrasebook.3
+MAN3=		Net::Appliance::Phrasebook.3
 
 .include <bsd.port.mk>
diff --git a/net/p5-Net-Appliance-Phrasebook/distinfo b/net/p5-Net-Appliance-Phrasebook/distinfo
index f79ff99adaa0..b3accbc08c49 100644
--- a/net/p5-Net-Appliance-Phrasebook/distinfo
+++ b/net/p5-Net-Appliance-Phrasebook/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Net-Appliance-Phrasebook-1.8.tar.gz) = 2419cfc891ff4a12ee7faa7b7ce2c26c1c5d7aef8ac4d26dbd811b2829406be6
-SIZE (Net-Appliance-Phrasebook-1.8.tar.gz) = 19555
+SHA256 (Net-Appliance-Phrasebook-2.103642.tar.gz) = 0383e2fc883b655a4959ff2e765909df5e226f80a1ed33a7d5cec4d98ac74b09
+SIZE (Net-Appliance-Phrasebook-2.103642.tar.gz) = 16588
diff --git a/net/p5-Net-Appliance-Phrasebook/pkg-plist b/net/p5-Net-Appliance-Phrasebook/pkg-plist
index 337546b3610b..448e9e0485bc 100644
--- a/net/p5-Net-Appliance-Phrasebook/pkg-plist
+++ b/net/p5-Net-Appliance-Phrasebook/pkg-plist
@@ -1,9 +1,9 @@
 %%SITE_PERL%%/Net/Appliance/Phrasebook.pm
 %%SITE_PERL%%/Net/Appliance/Phrasebook/nas-pb.yml
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Appliance/Phrasebook/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Appliance/Phrasebook
-@dirrmtry %%SITE_PERL%%/Net/Appliance/Phrasebook
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Appliance/Phrasebook
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Appliance
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrm %%SITE_PERL%%/Net/Appliance/Phrasebook
 @dirrmtry %%SITE_PERL%%/Net/Appliance
 @dirrmtry %%SITE_PERL%%/Net