diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index b2779bca300c..b5b7bcc3c2c7 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openxpki
-PORTVERSION=	0.9.1267
+PORTVERSION=	0.9.1389
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -77,7 +77,6 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::pkcs7_get_chain.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::pkcs7_sign.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::pkcs7_verify.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::symmetric_cipher.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Config.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Engine.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Engine::GOST.3 \
@@ -178,6 +177,7 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::Server::Workflow::Activity::CRLIssuance::IssueCRL.3 \
 	OpenXPKI::Server::Workflow::Activity::CRLIssuance::PublishCRL.3 \
 	OpenXPKI::Server::Workflow::Activity::CRR::PersistRequest.3 \
+	OpenXPKI::Server::Workflow::Activity::CSR::ChangeNotBeforeOrAfter.3 \
 	OpenXPKI::Server::Workflow::Activity::CSR::GenerateKey.3 \
 	OpenXPKI::Server::Workflow::Activity::CSR::GeneratePKCS10.3 \
 	OpenXPKI::Server::Workflow::Activity::CSR::PersistRequest.3 \
@@ -198,6 +198,8 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::Server::Workflow::Activity::DataExchange::ReadArchive.3 \
 	OpenXPKI::Server::Workflow::Activity::DataExchange::UnpackArchive.3 \
 	OpenXPKI::Server::Workflow::Activity::DataExchange::WriteArchive.3 \
+	OpenXPKI::Server::Workflow::Activity::PasswordSafe::RetrievePassword.3 \
+	OpenXPKI::Server::Workflow::Activity::PasswordSafe::StorePassword.3 \
 	OpenXPKI::Server::Workflow::Activity::SCEP::ExtractCSR.3 \
 	OpenXPKI::Server::Workflow::Activity::SCEP::SetContextFromCSR.3 \
 	OpenXPKI::Server::Workflow::Activity::SCEP::SetContextFromOriginalCert.3 \
@@ -263,6 +265,8 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::Server::Workflow::Validator::PasswordQuality.3 \
 	OpenXPKI::Server::Workflow::Validator::ReasonCode.3 \
 	OpenXPKI::Server::Workflow::Validator::SPKAC.3 \
+	OpenXPKI::Server::Workflow::Validator::UnusedID.3 \
+	OpenXPKI::Server::Workflow::Validator::ValidityTime.3 \
 	OpenXPKI::Service.3 \
 	OpenXPKI::Service::Default.3 \
 	OpenXPKI::Service::Default::Command.3 \
diff --git a/security/p5-openxpki/distinfo b/security/p5-openxpki/distinfo
index 45c4d1638490..1873106350b9 100644
--- a/security/p5-openxpki/distinfo
+++ b/security/p5-openxpki/distinfo
@@ -1,3 +1,3 @@
-MD5 (openxpki/OpenXPKI-0.9.1267.tar.gz) = f22b8b2ebc1ab153bcb8e1e485fa72e2
-SHA256 (openxpki/OpenXPKI-0.9.1267.tar.gz) = 6af16d9f94dd3c7cd853b3f15edd21ca5b2dcdc51bd5b7b56b13473b457fe234
-SIZE (openxpki/OpenXPKI-0.9.1267.tar.gz) = 495458
+MD5 (openxpki/OpenXPKI-0.9.1389.tar.gz) = 2afe112baaa40c8b31b69c2ffba745c1
+SHA256 (openxpki/OpenXPKI-0.9.1389.tar.gz) = 3041b9eef49e51496de54a16df5015aebeee3823b5b28fcf9254e06e970a6287
+SIZE (openxpki/OpenXPKI-0.9.1389.tar.gz) = 509304
diff --git a/security/p5-openxpki/pkg-plist b/security/p5-openxpki/pkg-plist
index 945728b77bf7..c6d1000f497b 100644
--- a/security/p5-openxpki/pkg-plist
+++ b/security/p5-openxpki/pkg-plist
@@ -32,7 +32,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_get_chain.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_sign.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_verify.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/symmetric_cipher.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Config.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine/GOST.pm
@@ -137,6 +136,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRLIssuance/IssueCRL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRLIssuance/PublishCRL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRR/PersistRequest.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/ChangeNotBeforeOrAfter.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/GenerateKey.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/GeneratePKCS10.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/PersistRequest.pm
@@ -157,6 +157,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/ReadArchive.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/UnpackArchive.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/WriteArchive.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/PasswordSafe/RetrievePassword.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/PasswordSafe/StorePassword.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEP/ExtractCSR.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEP/SetContextFromCSR.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEP/SetContextFromOriginalCert.pm
@@ -223,6 +225,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/PasswordQuality.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/ReasonCode.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/SPKAC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/UnusedID.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/ValidityTime.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Default.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Default/Command.pm
@@ -261,6 +265,7 @@
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/SCEP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/PasswordSafe
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertLdapPublish
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertIssuance