diff --git a/mail/p5-Mail-Mbox-MessageParser/Makefile b/mail/p5-Mail-Mbox-MessageParser/Makefile
index c9ffdc8e2434..8383838bd12b 100644
--- a/mail/p5-Mail-Mbox-MessageParser/Makefile
+++ b/mail/p5-Mail-Mbox-MessageParser/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Mail-Mbox-MessageParser
-PORTVERSION=	1.5002
-PORTREVISION=	2
+PORTVERSION=	1.5100
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,12 +10,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fast and simple mbox folder reader
 
-BUILD_DEPENDS=	p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-FileHandle-Unget>=0:${PORTSDIR}/devel/p5-FileHandle-Unget
+BUILD_DEPENDS=	p5-FileHandle-Unget>=0:${PORTSDIR}/devel/p5-FileHandle-Unget
 RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff
 
 USES=		perl5
 USE_PERL5=	configure
-CONFIGURE_ARGS+=	</dev/null
+
+post-patch:
+	# If upstream adds a =cut in a future release, this patch will break configure
+	@${REINPLACE_CMD} -e '/=encoding utf-8/d' ${WRKSRC}/inc/Sort/Versions.pm
 
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Mbox-MessageParser/distinfo b/mail/p5-Mail-Mbox-MessageParser/distinfo
index 09cc0f0af9f0..56339f0a76b8 100644
--- a/mail/p5-Mail-Mbox-MessageParser/distinfo
+++ b/mail/p5-Mail-Mbox-MessageParser/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Mail-Mbox-MessageParser-1.5002.tar.gz) = aec53e3fed438cc70a62539d2c3c2d16042ceff2f5fd262e45b78dc620fdb41a
-SIZE (Mail-Mbox-MessageParser-1.5002.tar.gz) = 266361
+SHA256 (Mail-Mbox-MessageParser-1.5100.tar.gz) = 4ca9c7300156fc1490c3ba474bea0bdc788495343d23b81bfef10b6483a28e4f
+SIZE (Mail-Mbox-MessageParser-1.5100.tar.gz) = 283525
diff --git a/mail/p5-Mail-Mbox-MessageParser/pkg-descr b/mail/p5-Mail-Mbox-MessageParser/pkg-descr
index b66fa5605ef7..84ec0d4c67a0 100644
--- a/mail/p5-Mail-Mbox-MessageParser/pkg-descr
+++ b/mail/p5-Mail-Mbox-MessageParser/pkg-descr
@@ -1,5 +1,5 @@
-Mail::Mbox::MessageParser is a feature-poor but very fast mbox parser. It uses
+Mail::Mbox::MessageParser is a very fast but very simple mbox parser. It uses
 the best of three strategies for parsing a mailbox: either using cached folder
 information, GNU grep, or highly optimized Perl.
 
-WWW: http://m-m-msgparser.sourceforge.net/
+WWW: https://metacpan.org/pod/Mail::Mbox::MessageParser