diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index 7820bb15b8e4bd13deb22062e7e3738c374acd57..40c950a9e04e53b120afe36e3122e9d6117207c2 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -376,12 +376,16 @@ class SimpleSAML_Metadata_SAMLParser {
 		 * Add organizational metadata
 		 */
 		if (!empty($this->organizationName)) {
+			$ret['name'] = $this->organizationName;
+			$ret['description'] = $this->organizationName;
 			$ret['OrganizationName'] = $this->organizationName;
 		}
 		if (!empty($this->organizationDisplayName)) {
+			$ret['name'] = $this->organizationDisplayName;
 			$ret['OrganizationDisplayName'] = $this->organizationDisplayName;
 		}
 		if (!empty($this->organizationURL)) {
+			$ret['url'] = $this->organizationURL;
 			$ret['OrganizationURL'] = $this->organizationURL;
 		}