diff --git a/modules/aggregator/dictionaries/dict.php b/modules/aggregator/dictionaries/dict.php
index 86f74c2db01c774864aadd9ba5e1de05a51cde6d..1e6b4d4955e4189a7666775a6d7251c98464bf3b 100644
--- a/modules/aggregator/dictionaries/dict.php
+++ b/modules/aggregator/dictionaries/dict.php
@@ -13,7 +13,6 @@ $lang = array(
 	'text' => array (
 		'en' => 'text',
 	),
-
 );
 
 
diff --git a/modules/aggregator/templates/default/list.php b/modules/aggregator/templates/default/list.php
index 5a8f7f318fec15b5a58fbd3a318fdb8d7d600a81..476132c030b1944a656e42a98fdccded53a16d90 100644
--- a/modules/aggregator/templates/default/list.php
+++ b/modules/aggregator/templates/default/list.php
@@ -17,6 +17,7 @@ if (count($this->data['sources']) === 0) {
 		echo('<li>');
 		echo('<a href="?id=' . $encId . '">' . $encName . '</a>');
 		echo(' <a href="?id=' . $encId . '&amp;mimetype=text/plain">[' . $this->t('{aggregator:dict:text}') . ']</a>');
+		echo(' <a href="?id=' . $encId . '&amp;mimetype=application/xml">[xml]</a>');
 		echo('</li>');
 	}
 
diff --git a/modules/aggregator/www/index.php b/modules/aggregator/www/index.php
index 8605b5e6110c68baca84eb4a5ff598dbe5903e54..fe5cd0cb2c8b0106def8e33a5f8805bc01dd7f89 100644
--- a/modules/aggregator/www/index.php
+++ b/modules/aggregator/www/index.php
@@ -61,8 +61,11 @@ foreach ($sources as $source) {
 
 $xml = new DOMDocument();
 $entitiesDescriptor = $xml->createElementNS('urn:oasis:names:tc:SAML:2.0:metadata', 'EntitiesDescriptor');
+$entitiesDescriptor->setAttribute('Name', $id);
 $xml->appendChild($entitiesDescriptor);
 
+
+
 /* Build EntityDescriptor elements for them. */
 foreach ($entities as $entity => $sets) {