diff --git a/textproc/p5-YAML/Makefile b/textproc/p5-YAML/Makefile
index a8c238c09c4c..a380bf7aa907 100644
--- a/textproc/p5-YAML/Makefile
+++ b/textproc/p5-YAML/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	YAML
-PORTVERSION=	0.84
+PORTVERSION=	0.87
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -9,22 +9,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	YAML implementation in Perl
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	\
-	Test::YAML.3 \
-	YAML.3 \
-	YAML::Any.3 \
-	YAML::Dumper.3 \
-	YAML::Dumper::Base.3 \
-	YAML::Error.3 \
-	YAML::Loader.3 \
-	YAML::Loader::Base.3 \
-	YAML::Marshall.3 \
-	YAML::Node.3 \
-	YAML::Tag.3 \
-	YAML::Types.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-YAML/distinfo b/textproc/p5-YAML/distinfo
index 9bfbac458110..9c4ae461f99e 100644
--- a/textproc/p5-YAML/distinfo
+++ b/textproc/p5-YAML/distinfo
@@ -1,2 +1,2 @@
-SHA256 (YAML-0.84.tar.gz) = 0a351f0a771526ca4a448c573a781614debdd5296fd0832396fc89f1854d640c
-SIZE (YAML-0.84.tar.gz) = 121150
+SHA256 (YAML-0.87.tar.gz) = 729d73730ca517130cee6af7bb29d90a9f4d88e417ed4e5e4d3d281bd390cb13
+SIZE (YAML-0.87.tar.gz) = 121954
diff --git a/textproc/p5-YAML/pkg-plist b/textproc/p5-YAML/pkg-plist
index 7811da8e1544..3d24a538c07a 100644
--- a/textproc/p5-YAML/pkg-plist
+++ b/textproc/p5-YAML/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/.packlist
 %%SITE_PERL%%/Test/YAML.pm
 %%SITE_PERL%%/YAML.pm
 %%SITE_PERL%%/YAML/Any.pm
@@ -12,8 +11,21 @@
 %%SITE_PERL%%/YAML/Node.pm
 %%SITE_PERL%%/YAML/Tag.pm
 %%SITE_PERL%%/YAML/Types.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/.packlist
+%%PERL5_MAN3%%/Test::YAML.3.gz
+%%PERL5_MAN3%%/YAML.3.gz
+%%PERL5_MAN3%%/YAML::Any.3.gz
+%%PERL5_MAN3%%/YAML::Dumper.3.gz
+%%PERL5_MAN3%%/YAML::Dumper::Base.3.gz
+%%PERL5_MAN3%%/YAML::Error.3.gz
+%%PERL5_MAN3%%/YAML::Loader.3.gz
+%%PERL5_MAN3%%/YAML::Loader::Base.3.gz
+%%PERL5_MAN3%%/YAML::Marshall.3.gz
+%%PERL5_MAN3%%/YAML::Node.3.gz
+%%PERL5_MAN3%%/YAML::Tag.3.gz
+%%PERL5_MAN3%%/YAML::Types.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML
-@dirrmtry %%SITE_PERL%%/YAML/Dumper
 @dirrmtry %%SITE_PERL%%/YAML/Loader
-@dirrmtry %%SITE_PERL%%/Test
+@dirrmtry %%SITE_PERL%%/YAML/Dumper
 @dirrmtry %%SITE_PERL%%/YAML
+@dirrmtry %%SITE_PERL%%/Test