diff --git a/security/p5-Authen-SASL/Makefile b/security/p5-Authen-SASL/Makefile
index 53f4fc30f240..09dc1eee33aa 100644
--- a/security/p5-Authen-SASL/Makefile
+++ b/security/p5-Authen-SASL/Makefile
@@ -11,15 +11,20 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module for SASL authentication
 
-RUN_DEPENDS=	p5-Digest-HMAC>0:security/p5-Digest-HMAC
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	p5-Digest-HMAC>0:security/p5-Digest-HMAC
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	KERBEROS
 OPTIONS_DEFAULT=KERBEROS
 
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
-CONFIGURE_ENV+=	AUTOMATED_TESTING=yes
+CONFIGURE_ENV=	AUTOMATED_TESTING=yes
 
 KERBEROS_BUILD_DEPENDS=	p5-GSSAPI>0:security/p5-GSSAPI
 KERBEROS_RUN_DEPENDS=	p5-GSSAPI>0:security/p5-GSSAPI
diff --git a/security/p5-Authen-SASL/pkg-plist b/security/p5-Authen-SASL/pkg-plist
index a8c5648a12ab..d84fa12f7f06 100644
--- a/security/p5-Authen-SASL/pkg-plist
+++ b/security/p5-Authen-SASL/pkg-plist
@@ -1,12 +1,3 @@
-%%PERL5_MAN3%%/Authen::SASL.3.gz
-%%PERL5_MAN3%%/Authen::SASL::Perl.3.gz
-%%PERL5_MAN3%%/Authen::SASL::Perl::ANONYMOUS.3.gz
-%%PERL5_MAN3%%/Authen::SASL::Perl::CRAM_MD5.3.gz
-%%PERL5_MAN3%%/Authen::SASL::Perl::DIGEST_MD5.3.gz
-%%PERL5_MAN3%%/Authen::SASL::Perl::EXTERNAL.3.gz
-%%PERL5_MAN3%%/Authen::SASL::Perl::GSSAPI.3.gz
-%%PERL5_MAN3%%/Authen::SASL::Perl::LOGIN.3.gz
-%%PERL5_MAN3%%/Authen::SASL::Perl::PLAIN.3.gz
 %%SITE_PERL%%/Authen/SASL.pm
 %%SITE_PERL%%/Authen/SASL.pod
 %%SITE_PERL%%/Authen/SASL/CRAM_MD5.pm
@@ -20,3 +11,12 @@
 %%SITE_PERL%%/Authen/SASL/Perl/GSSAPI.pm
 %%SITE_PERL%%/Authen/SASL/Perl/LOGIN.pm
 %%SITE_PERL%%/Authen/SASL/Perl/PLAIN.pm
+%%PERL5_MAN3%%/Authen::SASL.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::ANONYMOUS.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::CRAM_MD5.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::DIGEST_MD5.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::EXTERNAL.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::GSSAPI.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::LOGIN.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::PLAIN.3.gz