diff --git a/mail/p5-Email-Folder-POP3/Makefile b/mail/p5-Email-Folder-POP3/Makefile
index 6da8c711fa34..2d4c558880f3 100644
--- a/mail/p5-Email-Folder-POP3/Makefile
+++ b/mail/p5-Email-Folder-POP3/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Email::Folder access to POP3 folders
 
 RUN_DEPENDS=	p5-URI>=1.35:net/p5-URI \
-		p5-Email-FolderType-Net>=1.02:mail/p5-Email-FolderType-Net \
+		p5-Email-FolderType-Net>=1.020:mail/p5-Email-FolderType-Net \
 		p5-Email-Folder>=0.840:mail/p5-Email-Folder \
 		p5-Net>=1.19:net/p5-Net
 BUILD_DEPENDS:=	${RUN_DEPENDS}
diff --git a/mail/p5-Email-FolderType-Net/Makefile b/mail/p5-Email-FolderType-Net/Makefile
index 409935b2abcf..8464dfcf0b1a 100644
--- a/mail/p5-Email-FolderType-Net/Makefile
+++ b/mail/p5-Email-FolderType-Net/Makefile
@@ -2,20 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	Email-FolderType-Net
-PORTVERSION=	1.04.1
-PORTREVISION=	1
+PORTVERSION=	1.043
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Recognize folder types for network based message protocols
 
-RUN_DEPENDS=	p5-URI>=1.35:net/p5-URI \
-		p5-Email-FolderType>=0.8:mail/p5-Email-FolderType
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	p5-Email-FolderType>=0.8:mail/p5-Email-FolderType \
+		p5-URI>=1.35:net/p5-URI
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/mail/p5-Email-FolderType-Net/distinfo b/mail/p5-Email-FolderType-Net/distinfo
index 10d804764870..5e3c5667835f 100644
--- a/mail/p5-Email-FolderType-Net/distinfo
+++ b/mail/p5-Email-FolderType-Net/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Email-FolderType-Net-1.041.tar.gz) = 01277d6ebdf0fdbf17609d8fe209b03c60a32a2e9aaaf869e61ce3a678bb83da
-SIZE (Email-FolderType-Net-1.041.tar.gz) = 9725
+TIMESTAMP = 1492965262
+SHA256 (Email-FolderType-Net-1.043.tar.gz) = afd4bdb2df540447f2bab3b37dc8d41087d4586369a3434f34ad64872b70589e
+SIZE (Email-FolderType-Net-1.043.tar.gz) = 12615