diff --git a/mail/p5-Email-Filter/Makefile b/mail/p5-Email-Filter/Makefile
index 1ccf9ea14c9b..cc46d0b4e121 100644
--- a/mail/p5-Email-Filter/Makefile
+++ b/mail/p5-Email-Filter/Makefile
@@ -2,22 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	Email-Filter
-PORTVERSION=	1.03.3
-PORTREVISION=	1
+PORTVERSION=	1.034
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Library for creating easy email filters
 
-BUILD_DEPENDS=	p5-Email-Simple>=0:mail/p5-Email-Simple \
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	p5-Class-Trigger>=0:devel/p5-Class-Trigger \
 		p5-Email-LocalDelivery>=0:mail/p5-Email-LocalDelivery \
-		p5-IPC-Run>=0:devel/p5-IPC-Run \
-		p5-Class-Trigger>=0:devel/p5-Class-Trigger
+		p5-Email-Simple>=0:mail/p5-Email-Simple \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/mail/p5-Email-Filter/distinfo b/mail/p5-Email-Filter/distinfo
index 8069c9a3824f..65972cc38ab4 100644
--- a/mail/p5-Email-Filter/distinfo
+++ b/mail/p5-Email-Filter/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Email-Filter-1.033.tar.gz) = 755989f97398ddbf86bc59faf93e81b981baccbf5385de9ca4f98b1ea350afdf
-SIZE (Email-Filter-1.033.tar.gz) = 17744
+TIMESTAMP = 1488262573
+SHA256 (Email-Filter-1.034.tar.gz) = b640f3cdd997b3aa513e542db4af2a1016f5aa3ca379f3779bf3195a2898e2f7
+SIZE (Email-Filter-1.034.tar.gz) = 18133
diff --git a/mail/p5-Email-Filter/pkg-plist b/mail/p5-Email-Filter/pkg-plist
index 48abd2e1880c..5e54127009af 100644
--- a/mail/p5-Email-Filter/pkg-plist
+++ b/mail/p5-Email-Filter/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/Email::Filter.3.gz
 %%SITE_PERL%%/Email/Filter.pm
+%%PERL5_MAN3%%/Email::Filter.3.gz