diff --git a/modules/core/dictionaries/frontpage.php b/modules/core/dictionaries/frontpage.php
index cdb138dc8e4d435f511a5d786dbc7935d1af6993..54996c8fccf5cbb6a142ce112cf97d96338a1002 100644
--- a/modules/core/dictionaries/frontpage.php
+++ b/modules/core/dictionaries/frontpage.php
@@ -900,6 +900,9 @@ $lang = array(
 		'es' => 'Probar las fuentes para la autentificaciĂłn ya configuradas',
 		'tr' => 'Düzenlenmiş kimlik doğrulama kaynaklarını test et',
 	),
+	'deprecated' => array (
+		'en' => 'Deprecated',
+	),
 
 );
 
diff --git a/modules/core/templates/frontpage_auth.tpl.php b/modules/core/templates/frontpage_auth.tpl.php
index 8c9764fd306902e84b043867b22494284059b1b4..7e58920b28e2e62c85fa31bc9f7921fa11abcc90 100644
--- a/modules/core/templates/frontpage_auth.tpl.php
+++ b/modules/core/templates/frontpage_auth.tpl.php
@@ -18,7 +18,11 @@ if ($this->data['isadmin']) {
 <ul>
 <?php
 	foreach ($this->data['links_auth'] AS $link) {
-		echo '<li><a href="' . htmlspecialchars($link['href']) . '">' . $this->t($link['text']) . '</a></li>';
+		echo '<li><a href="' . htmlspecialchars($link['href']) . '">' . $this->t($link['text']) . '</a>';
+		if (isset($link['deprecated']) && $link['deprecated']) {
+			echo ' <b>' . $this->t('{core:frontpage:deprecated}') . '</b>';
+		}
+		echo '</li>';
 	}
 ?>
 </ul>
diff --git a/modules/core/www/frontpage_auth.php b/modules/core/www/frontpage_auth.php
index 37d07180fb527adba1f5eb1a70047d4a458465f2..fa1bc296b1f2b30bb5ca80be583ee94fccf4849c 100644
--- a/modules/core/www/frontpage_auth.php
+++ b/modules/core/www/frontpage_auth.php
@@ -32,12 +32,16 @@ $links_auth[] = array(
 if ($config->getValue('enable.saml20-sp') === true)
 	$links_auth[] = array(
 		'href' => SimpleSAML_Utilities::getBaseURL() . 'example-simple/saml2-example.php',
-		'text' => '{core:frontpage:link_saml2example}');
+		'text' => '{core:frontpage:link_saml2example}',
+		'deprecated' => TRUE,
+	);
 
 if ($config->getValue('enable.shib13-sp') === true)
 	$links_auth[] = array(
 		'href' => SimpleSAML_Utilities::getBaseURL() . 'example-simple/shib13-example.php',
-		'text' => '{core:frontpage:link_shib13example}');
+		'text' => '{core:frontpage:link_shib13example}',
+		'deprecated' => TRUE,
+	);
 
 
 $allLinks = array(