diff --git a/modules/core/templates/frontpage_federation.tpl.php b/modules/core/templates/frontpage_federation.tpl.php
index 874de7ec792a5809fe873dced0c58659505adcf7..6bc4039eee9274066c90dfcfc26efb66e9af155c 100644
--- a/modules/core/templates/frontpage_federation.tpl.php
+++ b/modules/core/templates/frontpage_federation.tpl.php
@@ -55,6 +55,8 @@ foreach ($this->data['metaentries']['hosted'] AS $hm) {
 	echo '<dt>' . $this->t(mtype($hm['metadata-set'])) . '</dt>';
 	echo '<dd>';
 	echo '<p>Entity ID: ' . $hm['entityid'];
+	if (isset($hm['deprecated']) && $hm['deprecated'])
+		echo '<br /><b>Deprecated</b>';
 	if ($hm['entityid'] !== $hm['metadata-index']) 
 		echo '<br />Index: ' . $hm['metadata-index'];
 	if (array_key_exists('name', $hm))
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index 429b84d81584251c7deff3fc7bd353f8e696e633..9b91f328505ceaf2eda6f4f4b616b92e51691229 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -96,6 +96,7 @@ $metaentries = array('hosted' => $metadataHosted, 'remote' => array() );
 if ($config->getBoolean('enable.saml20-sp', TRUE) === true) {
 	try {
 		$metaentries['hosted']['saml20-sp'] = $metadata->getMetaDataCurrent('saml20-sp-hosted');
+		$metaentries['hosted']['saml20-sp']['deprecated'] = TRUE;
 		$metaentries['hosted']['saml20-sp']['metadata-url'] = '/' . $config->getBaseURL() . 'saml2/sp/metadata.php?output=xhtml';
 		if ($isadmin)
 			$metaentries['remote']['saml20-idp-remote'] = $metadata->getList('saml20-idp-remote');
@@ -112,6 +113,7 @@ if ($config->getBoolean('enable.saml20-idp', FALSE) === true) {
 if ($config->getBoolean('enable.shib13-sp', FALSE) === true) {
 	try {
 		$metaentries['hosted']['shib13-sp'] = $metadata->getMetaDataCurrent('shib13-sp-hosted');
+		$metaentries['hosted']['shib13-sp']['deprecated'] = TRUE;
 		$metaentries['hosted']['shib13-sp']['metadata-url'] = '/' . $config->getBaseURL() . 'shib13/sp/metadata.php?output=xhtml';
 		if ($isadmin)
 			$metaentries['remote']['shib13-idp-remote'] = $metadata->getList('shib13-idp-remote');