diff --git a/textproc/p5-YAML-PP/Makefile b/textproc/p5-YAML-PP/Makefile
index 9f03d4fe035a..9fbe79f7c991 100644
--- a/textproc/p5-YAML-PP/Makefile
+++ b/textproc/p5-YAML-PP/Makefile
@@ -1,20 +1,19 @@
 PORTNAME=	YAML-PP
-PORTVERSION=	0.020
-PORTREVISION=	1
+PORTVERSION=	0.031
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	YAML which aims to parse YAML 1.2 & conform to the spec
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-YAML-PP/distinfo b/textproc/p5-YAML-PP/distinfo
index 378212377722..d7a379c52816 100644
--- a/textproc/p5-YAML-PP/distinfo
+++ b/textproc/p5-YAML-PP/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582632282
-SHA256 (YAML-PP-0.020.tar.gz) = 3707d9a7402ca7d229ea0a87cf7e2a013fdb99b658fc249ee14072803b3874a7
-SIZE (YAML-PP-0.020.tar.gz) = 173229
+TIMESTAMP = 1643043335
+SHA256 (YAML-PP-0.031.tar.gz) = d7c837f732b023b67aa3666d14887f1cd756ce5c5bb6b07eee0b3701cf9e4cf8
+SIZE (YAML-PP-0.031.tar.gz) = 199191
diff --git a/textproc/p5-YAML-PP/pkg-descr b/textproc/p5-YAML-PP/pkg-descr
index 245933ae1a1c..7956bba73cd8 100644
--- a/textproc/p5-YAML-PP/pkg-descr
+++ b/textproc/p5-YAML-PP/pkg-descr
@@ -1,20 +1,11 @@
-WARNING: This is highly experimental.
+YAML::PP is a modular YAML processor for YAML 1.2.
 
-Here are a few examples of what you can do right now:
+Additionally to loading and dumping it provides a parser and emitter. The
+parsing events are compatible to the YAML Test Suite and other libraries like
+libyaml.
 
-    my $yppl = YAML::PP::Loader->new;
-    my @documents = $yppl->load_string($yaml);
+Loading and Dumping can be customized.
 
-    # load file
-    my $yppl = YAML::PP::Loader->new;
-    my @documents = $yppl->load_file($filename);
-
-    # The loader offers JSON::PP, boolean.pm or pureperl 1/0 (default)
-    # for booleans
-    my $yppl = YAML::PP::Loader->new(boolean => 'JSON::PP');
-    my ($data1, $data2) = $yppl->load_string($yaml);
-
-    my $yppd = YAML::PP::Dumper->new();
-    my $yaml = $yppd->dump_string($data1, $data2);
+It supports the YAML 1.2 Failsafe, JSON and Core Schemas.
 
 WWW: https://github.com/perlpunk/YAML-PP-p5
diff --git a/textproc/p5-YAML-PP/pkg-message b/textproc/p5-YAML-PP/pkg-message
new file mode 100644
index 000000000000..ee90032f7a1c
--- /dev/null
+++ b/textproc/p5-YAML-PP/pkg-message
@@ -0,0 +1,20 @@
+[
+{
+  type: upgrade
+  maximum_version: "0.031"
+  message: <<EOM
+Scripts renamed from:
+  bin/yamlpp5-events
+  bin/yamlpp5-highlight
+  bin/yamlpp5-load
+  bin/yamlpp5-load-dump
+  bin/yamlpp5-parse-emit
+to:
+  bin/yamlpp-events
+  bin/yamlpp-highlight
+  bin/yamlpp-load
+  bin/yamlpp-load-dump
+  bin/yamlpp-parse-emit
+EOM
+}
+]
diff --git a/textproc/p5-YAML-PP/pkg-plist b/textproc/p5-YAML-PP/pkg-plist
index 994e05f7c1b3..29f73bef9402 100644
--- a/textproc/p5-YAML-PP/pkg-plist
+++ b/textproc/p5-YAML-PP/pkg-plist
@@ -1,53 +1,53 @@
-bin/yamlpp5-events
-bin/yamlpp5-highlight
-bin/yamlpp5-load
-bin/yamlpp5-load-dump
-bin/yamlpp5-parse-emit
+bin/yamlpp-events
+bin/yamlpp-highlight
+bin/yamlpp-load
+bin/yamlpp-load-dump
+bin/yamlpp-parse-emit
 %%SITE_PERL%%/YAML/PP.pm
 %%SITE_PERL%%/YAML/PP/Common.pm
 %%SITE_PERL%%/YAML/PP/Constructor.pm
 %%SITE_PERL%%/YAML/PP/Dumper.pm
 %%SITE_PERL%%/YAML/PP/Emitter.pm
 %%SITE_PERL%%/YAML/PP/Exception.pm
 %%SITE_PERL%%/YAML/PP/Grammar.pm
 %%SITE_PERL%%/YAML/PP/Highlight.pm
 %%SITE_PERL%%/YAML/PP/Lexer.pm
 %%SITE_PERL%%/YAML/PP/Loader.pm
 %%SITE_PERL%%/YAML/PP/Parser.pm
 %%SITE_PERL%%/YAML/PP/Perl.pm
 %%SITE_PERL%%/YAML/PP/Reader.pm
 %%SITE_PERL%%/YAML/PP/Render.pm
 %%SITE_PERL%%/YAML/PP/Representer.pm
 %%SITE_PERL%%/YAML/PP/Schema.pm
 %%SITE_PERL%%/YAML/PP/Schema/Binary.pm
 %%SITE_PERL%%/YAML/PP/Schema/Core.pm
 %%SITE_PERL%%/YAML/PP/Schema/Failsafe.pm
 %%SITE_PERL%%/YAML/PP/Schema/Include.pm
 %%SITE_PERL%%/YAML/PP/Schema/JSON.pm
 %%SITE_PERL%%/YAML/PP/Schema/Merge.pm
 %%SITE_PERL%%/YAML/PP/Schema/Perl.pm
 %%SITE_PERL%%/YAML/PP/Schema/Tie/IxHash.pm
 %%SITE_PERL%%/YAML/PP/Schema/YAML1_1.pm
 %%SITE_PERL%%/YAML/PP/Type/MergeKey.pm
 %%SITE_PERL%%/YAML/PP/Writer.pm
 %%SITE_PERL%%/YAML/PP/Writer/File.pm
 %%PERL5_MAN3%%/YAML::PP.3.gz
 %%PERL5_MAN3%%/YAML::PP::Common.3.gz
 %%PERL5_MAN3%%/YAML::PP::Constructor.3.gz
 %%PERL5_MAN3%%/YAML::PP::Emitter.3.gz
 %%PERL5_MAN3%%/YAML::PP::Grammar.3.gz
 %%PERL5_MAN3%%/YAML::PP::Highlight.3.gz
 %%PERL5_MAN3%%/YAML::PP::Perl.3.gz
 %%PERL5_MAN3%%/YAML::PP::Schema.3.gz
 %%PERL5_MAN3%%/YAML::PP::Schema::Binary.3.gz
 %%PERL5_MAN3%%/YAML::PP::Schema::Core.3.gz
 %%PERL5_MAN3%%/YAML::PP::Schema::Failsafe.3.gz
 %%PERL5_MAN3%%/YAML::PP::Schema::Include.3.gz
 %%PERL5_MAN3%%/YAML::PP::Schema::JSON.3.gz
 %%PERL5_MAN3%%/YAML::PP::Schema::Merge.3.gz
 %%PERL5_MAN3%%/YAML::PP::Schema::Perl.3.gz
 %%PERL5_MAN3%%/YAML::PP::Schema::Tie::IxHash.3.gz
 %%PERL5_MAN3%%/YAML::PP::Schema::YAML1_1.3.gz
 %%PERL5_MAN3%%/YAML::PP::Type::MergeKey.3.gz
 %%PERL5_MAN3%%/YAML::PP::Writer.3.gz
 %%PERL5_MAN3%%/YAML::PP::Writer::File.3.gz