diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index 2db05b4ac18e..0ade9d7762cf 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openxpki
-PORTVERSION=	0.20.0.1
+PORTVERSION=	0.21.0.1
 CATEGORIES=	security perl5
 PKGNAMEPREFIX=	p5-
 DIST_SUBDIR=	openxpki
@@ -15,6 +15,20 @@ LICENSE=	APACHE20
 BUILD_DEPENDS=	\
 	p5-openxpki-i18n>=0.20.0.1:${PORTSDIR}/security/p5-openxpki-i18n \
 	openca-tools-forked>=1.4.0:${PORTSDIR}/security/openca-tools-forked \
+	p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
+	p5-Config-Merge>=0:${PORTSDIR}/devel/p5-Config-Merge \
+	p5-Connector>=0:${PORTSDIR}/devel/p5-Connector \
+	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
+	p5-Crypt-OpenSSL-AES>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-AES \
+	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
+	p5-LWP-Protocol-connect>=0:${PORTSDIR}/www/p5-LWP-Protocol-connect \
+	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
+	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
+	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
+	p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
+	p5-Proc-SafeExec>=0:${PORTSDIR}/devel/p5-Proc-SafeExec \
+	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
+	p5-Switch>=0:${PORTSDIR}/lang/p5-Switch \
 	p5-Workflow>=0.31:${PORTSDIR}/devel/p5-Workflow \
 	p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
 	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
@@ -55,7 +69,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	openxpki
 GH_PROJECT=	openxpki
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	d4dd0ab
+GH_COMMIT=	908559d
 
 USE_OPENSSL=	yes
 USE_PERL5=	configure
diff --git a/security/p5-openxpki/distinfo b/security/p5-openxpki/distinfo
index f2bf4e129121..11f47ff9d473 100644
--- a/security/p5-openxpki/distinfo
+++ b/security/p5-openxpki/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openxpki/openxpki-0.20.0.1.tar.gz) = 1777061581ff3493ba0b52f56357d60436bb785b41b9b3113ec068e2495603ef
-SIZE (openxpki/openxpki-0.20.0.1.tar.gz) = 2136470
+SHA256 (openxpki/openxpki-0.21.0.1.tar.gz) = de31c09d26aeb59ea449be4fd3ec90827742dacd6d0bcbb2c53027d142d5fd31
+SIZE (openxpki/openxpki-0.21.0.1.tar.gz) = 2144764
diff --git a/security/p5-openxpki/pkg-message b/security/p5-openxpki/pkg-message
index 3620eb479e9c..0bb125236536 100644
--- a/security/p5-openxpki/pkg-message
+++ b/security/p5-openxpki/pkg-message
@@ -1,6 +1,6 @@
 ==================================================================
-- SCEP prerequisite binary and i18n files for UI installed.
-- Enable utf8 locale (e.g. en_US.utf8) for the translation staff to work
+- SCEP prerequisite binary and i18n tools for UI installed.
+- Enable utf8 locale (e.g. en_US.utf8) for the translation staff to operate
   (translation is needed even for English language).
 - Install your favorite database (enable utf8 support) and a web server.
 - Perform deployment procedure for OpenXPKI in a regular way.
diff --git a/security/p5-openxpki/pkg-plist b/security/p5-openxpki/pkg-plist
index 55d5388c0789..88a083801df0 100644
--- a/security/p5-openxpki/pkg-plist
+++ b/security/p5-openxpki/pkg-plist
@@ -294,6 +294,7 @@ bin/openxpkictl
 %%PERL5_MAN3%%/OpenXPKI::Tests.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Transport::Simple.3.gz
 %%PERL5_MAN3%%/OpenXPKI::VERSION.3.gz
+%%PERL5_MAN3%%/OpenXPKI::Workflow::Config.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Workflow::Factory.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Workflow::Handler.3.gz
 %%PERL5_MAN3%%/OpenXPKI::XML::Cache.3.gz
@@ -614,6 +615,7 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Tests.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Transport/Simple.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/VERSION.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Workflow/Config.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Workflow/Factory.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Workflow/Handler.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/XML/Cache.pm