diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index 9f00df0ce978be7dcdb2b25c26902cc7343b6cf8..f06bceb821ac531c726291a94b47a16a24d6d7ee 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -520,6 +520,14 @@ class SimpleSAML_Metadata_SAMLParser {
 			$ret['attributes'] = $spd['attributes'];
 		}
 
+		/* Add name & description. */
+		if (array_key_exists('name', $spd)) {
+			$ret['name'] = $spd['name'];
+		}
+		if (array_key_exists('description', $spd)) {
+			$ret['description'] = $spd['description'];
+		}
+
 		/* Add certificate data. Only the first valid certificate will be added. */
 		foreach($spd['keys'] as $key) {
 			if($key['type'] !== 'X509Certificate') {
@@ -661,6 +669,14 @@ class SimpleSAML_Metadata_SAMLParser {
 			$ret['attributes'] = $spd['attributes'];
 		}
 
+		/* Add name & description. */
+		if (array_key_exists('name', $spd)) {
+			$ret['name'] = $spd['name'];
+		}
+		if (array_key_exists('description', $spd)) {
+			$ret['description'] = $spd['description'];
+		}
+
 		/* Add certificate data. Only the first valid certificate will be added. */
 		foreach($spd['keys'] as $key) {
 			if($key['type'] !== 'X509Certificate') {