diff --git a/devel/p5-DateTime-Format-Builder/Makefile b/devel/p5-DateTime-Format-Builder/Makefile
index 8d85f78ceb5e..6e23af75087b 100644
--- a/devel/p5-DateTime-Format-Builder/Makefile
+++ b/devel/p5-DateTime-Format-Builder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DateTime-Format-Builder
 PORTVERSION=	0.81
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,6 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create DateTime parser classes and objects
 
+LICENSE=	ART20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	p5-Class-Factory-Util>=1.6:${PORTSDIR}/devel/p5-Class-Factory-Util \
 		p5-DateTime>=0.12:${PORTSDIR}/devel/p5-DateTime \
 		p5-DateTime-Format-Strptime>=1.04:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
@@ -20,18 +23,15 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Devel-Cycle>=1.07:${PORTSDIR}/devel/p5-Devel-Cycle \
 		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	EXAMPLES
 
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-PORTDOCS=	Changes README
 PORTEXAMPLES=	Apache.pm Fall.pm ICal.pm MySQL.pm Simple.pm Tivoli.pm W3CDTF.pm
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
 
diff --git a/devel/p5-DateTime-Format-Builder/pkg-plist b/devel/p5-DateTime-Format-Builder/pkg-plist
index b557f0fa3200..e3d4607dc815 100644
--- a/devel/p5-DateTime-Format-Builder/pkg-plist
+++ b/devel/p5-DateTime-Format-Builder/pkg-plist
@@ -1,11 +1,3 @@
-%%PERL5_MAN3%%/DateTime::Format::Builder.3.gz
-%%PERL5_MAN3%%/DateTime::Format::Builder::Parser.3.gz
-%%PERL5_MAN3%%/DateTime::Format::Builder::Parser::Dispatch.3.gz
-%%PERL5_MAN3%%/DateTime::Format::Builder::Parser::Quick.3.gz
-%%PERL5_MAN3%%/DateTime::Format::Builder::Parser::Regex.3.gz
-%%PERL5_MAN3%%/DateTime::Format::Builder::Parser::Strptime.3.gz
-%%PERL5_MAN3%%/DateTime::Format::Builder::Parser::generic.3.gz
-%%PERL5_MAN3%%/DateTime::Format::Builder::Tutorial.3.gz
 %%SITE_PERL%%/DateTime/Format/Builder.pm
 %%SITE_PERL%%/DateTime/Format/Builder/Parser.pm
 %%SITE_PERL%%/DateTime/Format/Builder/Parser/Dispatch.pm
@@ -14,3 +6,11 @@
 %%SITE_PERL%%/DateTime/Format/Builder/Parser/Strptime.pm
 %%SITE_PERL%%/DateTime/Format/Builder/Parser/generic.pm
 %%SITE_PERL%%/DateTime/Format/Builder/Tutorial.pod
+%%PERL5_MAN3%%/DateTime::Format::Builder.3.gz
+%%PERL5_MAN3%%/DateTime::Format::Builder::Parser.3.gz
+%%PERL5_MAN3%%/DateTime::Format::Builder::Parser::Dispatch.3.gz
+%%PERL5_MAN3%%/DateTime::Format::Builder::Parser::Quick.3.gz
+%%PERL5_MAN3%%/DateTime::Format::Builder::Parser::Regex.3.gz
+%%PERL5_MAN3%%/DateTime::Format::Builder::Parser::Strptime.3.gz
+%%PERL5_MAN3%%/DateTime::Format::Builder::Parser::generic.3.gz
+%%PERL5_MAN3%%/DateTime::Format::Builder::Tutorial.3.gz