diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index be930bd355d992c6301286242fdc6dae1f5f8d2f..f96f0ef04f365ed5e59c1c999822d573930eb886 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -653,6 +653,7 @@ class SimpleSAML_Metadata_SAMLParser {
 	 * - 'SingleLogoutService': String with the URL where we should send logout requests(/responses).
 	 * - 'SingleLogoutServiceResponse': String where we should send logout responses (if this is different from
 	 *   the 'SingleLogoutService' endpoint.
+	 * - 'NameIDFormats': The name ID formats this IdP supports.
 	 * - 'certData': X509Certificate for entity (if present).
 	 * - 'certFingerprint': Fingerprint of the X509Certificate from the metadata.
 	 *
@@ -695,6 +696,8 @@ class SimpleSAML_Metadata_SAMLParser {
 		/* Find the ArtifactResolutionService endpoint. */
 		$ret['ArtifactResolutionService'] = $idp['ArtifactResolutionService'];
 
+		/* Add supported nameIDFormats */
+		$ret['NameIDFormats'] = $idp['nameIDFormats'];
 
 		/* Add public keys. */
 		if (!empty($idp['keys'])) {