diff --git a/mail/p5-Email-Folder/Makefile b/mail/p5-Email-Folder/Makefile
index f9dc5a0fc935..14249c5a0711 100644
--- a/mail/p5-Email-Folder/Makefile
+++ b/mail/p5-Email-Folder/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	Email-Folder
-PORTVERSION=	0.85.2
+PORTVERSION=	0.85.3
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-0.852
+DISTNAME=	${PORTNAME}-0.853
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Read all the messages from a folder as Email::Simple objects
@@ -27,9 +27,4 @@ MAN3=		Email::Folder.3 \
 		Email::Folder::Mbox.3 \
 		Email::Folder::Reader.3
 
-.include <bsd.port.pre.mk>
-.if ${PERL_LEVEL} < 500600
-post-patch:
-	${PERL} -pi -e '$$_="" if /use warnings;/' ${WRKSRC}/Makefile.PL
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/p5-Email-Folder/distinfo b/mail/p5-Email-Folder/distinfo
index 1783c932aa96..365161d318a2 100644
--- a/mail/p5-Email-Folder/distinfo
+++ b/mail/p5-Email-Folder/distinfo
@@ -1,3 +1,3 @@
-MD5 (Email-Folder-0.852.tar.gz) = 701f8546b19109036f31d8ce7183c861
-SHA256 (Email-Folder-0.852.tar.gz) = bf59f9265c9717a8eaa996757c6b748a7c34d0529ccfcbffcdcf13dfad6d3525
-SIZE (Email-Folder-0.852.tar.gz) = 26696
+MD5 (Email-Folder-0.853.tar.gz) = c1f6d72dffa1f30e1e22fe3f49c9ad00
+SHA256 (Email-Folder-0.853.tar.gz) = 39dbccd41be3c8cdcf75c578fad41eb2af9c6f53cd45576e1ae4b62973a95da1
+SIZE (Email-Folder-0.853.tar.gz) = 34039