diff --git a/devel/p5-Module-CPANTS-Analyse/Makefile b/devel/p5-Module-CPANTS-Analyse/Makefile
index 5ec4597c22d7..73e322b57d0c 100644
--- a/devel/p5-Module-CPANTS-Analyse/Makefile
+++ b/devel/p5-Module-CPANTS-Analyse/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Module-CPANTS-Analyse
-PORTVERSION=	0.92
-PORTREVISION=	1
+PORTVERSION=	0.96
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -20,20 +19,24 @@ BUILD_DEPENDS=	p5-Archive-Any-Lite>=0.06:${PORTSDIR}/archivers/p5-Archive-Any-Li
 		p5-CPAN-Meta>=2.131490:${PORTSDIR}/devel/p5-CPAN-Meta \
 		p5-CPAN-Meta-YAML>=0.008:${PORTSDIR}/devel/p5-CPAN-Meta-YAML \
 		p5-Class-Accessor>=0.19:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-File-Find-Rule-VCS>=0:${PORTSDIR}/devel/p5-File-Find-Rule-VCS \
 		p5-IO-Capture>=0.05:${PORTSDIR}/devel/p5-IO-Capture \
-		p5-Module-ExtractUse>=0.30:${PORTSDIR}/devel/p5-Module-ExtractUse \
+		p5-File-Find-Object>=0.2.1:${PORTSDIR}/devel/p5-File-Find-Object \
+		p5-Module-ExtractUse>=0.33:${PORTSDIR}/devel/p5-Module-ExtractUse \
 		p5-Set-Scalar>=0:${PORTSDIR}/devel/p5-Set-Scalar \
-		p5-Software-License>=0.003000:${PORTSDIR}/misc/p5-Software-License \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Warn>=0.11:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+		p5-Software-License>=0.103008:${PORTSDIR}/misc/p5-Software-License \
+		p5-Software-License-CCpack>=0:${PORTSDIR}/misc/p5-Software-License-CCpack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Warn>=0.11:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-FailWarnings>=0:${PORTSDIR}/devel/p5-Test-FailWarnings
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker-CPANfile>=0.06:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-CPANfile
 
 USES=		perl5
-USE_PERL5=	modbuild
+USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502000
+BUILD_DEPENDS+=	p5-CPAN-Meta>=2.133380:${PORTSDIR}/devel/p5-CPAN-Meta
+RUN_DEPENDS+=	p5-CPAN-Meta>=2.133380:${PORTSDIR}/devel/p5-CPAN-Meta
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Module-CPANTS-Analyse/distinfo b/devel/p5-Module-CPANTS-Analyse/distinfo
index 10efc0ecc71d..b8da970d59ed 100644
--- a/devel/p5-Module-CPANTS-Analyse/distinfo
+++ b/devel/p5-Module-CPANTS-Analyse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Module-CPANTS-Analyse-0.92.tar.gz) = 9cfaafcb197f3fd7f79809793b22e46f3d797b4b15547eb2edcb1854eb75baca
-SIZE (Module-CPANTS-Analyse-0.92.tar.gz) = 611368
+SHA256 (Module-CPANTS-Analyse-0.96.tar.gz) = 2789cc03b9beda03920d22da95185f296346c7802586aa02413af0d4977568b0
+SIZE (Module-CPANTS-Analyse-0.96.tar.gz) = 44323
diff --git a/devel/p5-Module-CPANTS-Analyse/pkg-plist b/devel/p5-Module-CPANTS-Analyse/pkg-plist
index af0caf63d1cc..ef94974c1938 100644
--- a/devel/p5-Module-CPANTS-Analyse/pkg-plist
+++ b/devel/p5-Module-CPANTS-Analyse/pkg-plist
@@ -1,4 +1,3 @@
-bin/cpants_lint.pl
 %%PERL5_MAN3%%/Module::CPANTS::Analyse.3.gz
 %%PERL5_MAN3%%/Module::CPANTS::Kwalitee.3.gz
 %%PERL5_MAN3%%/Module::CPANTS::Kwalitee::BrokenInstaller.3.gz
@@ -35,4 +34,3 @@ bin/cpants_lint.pl
 %%SITE_PERL%%/Module/CPANTS/Kwalitee/Signature.pm
 %%SITE_PERL%%/Module/CPANTS/Kwalitee/Uses.pm
 %%SITE_PERL%%/Module/CPANTS/Kwalitee/Version.pm
-man/man1/cpants_lint.pl.1.gz