diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index 5f05ad4e8a43b8dbec3964196c6e3c240f86dcd5..8bbef013556afda481627f209be727ed94f13347 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -35,6 +35,12 @@ if ($spconfig->getBoolean('saml20.binding.artifact.enable', FALSE)) {
 	$metaArray20['AssertionConsumerService.artifact'] = SimpleSAML_Module::getModuleURL('saml/sp/saml2-acs.php');
 }
 
+$certInfo = SimpleSAML_Utilities::loadPublicKey($spconfig->toArray());
+if ($certInfo !== NULL && array_key_exists('certData', $certInfo)) {
+	$certData = $certInfo['certData'];
+	$metaArray11['certData'] = $certData;
+	$metaArray20['certData'] = $certData;
+}