diff --git a/templates/default/en/metadata.php b/templates/default/en/metadata.php
index 57d48db4c85a1b1b946593ed772b502559a43376..7b6ff67fbf8b0381c9088ed29ab976536519d27a 100644
--- a/templates/default/en/metadata.php
+++ b/templates/default/en/metadata.php
@@ -14,12 +14,12 @@
 		
 		<p>In SAML 2.0 Meta data XML format:</p>
 		
-		<pre style="overflow: scroll; border: 1px solid #eee; padding: 2px"><?php echo $data['metadata']; ?></pre>
+		<pre class="metadatabox"><?php echo $data['metadata']; ?></pre>
 		
 		
 		<p>In simpleSAMLphp flat file format - use this if you are using a simpleSAMLphp entity on the other side:</p>
 		
-		<pre style="overflow: scroll; border: 1px solid #eee; padding: 2px"><?php echo $data['metadataflat']; ?></pre>
+		<pre class="metadatabox"><?php echo $data['metadataflat']; ?></pre>
 		
 		
 
diff --git a/www/index.php b/www/index.php
index 17697b1b9f4b364cd099b96014feb8345f45b765..ef77bc18e1f22a7a51e65fe822ada3db8500adf3 100644
--- a/www/index.php
+++ b/www/index.php
@@ -67,9 +67,21 @@ if ($config->getValue('enable.saml20-idp') === true)
 	$linksmeta[] = array(
 		'href' => 'saml2/idp/metadata.php', 
 		'text' => 'Hosted SAML 2.0 Identity Provider Metadata (automatically generated)');
+
+if ($config->getValue('enable.shib13-sp') === true)
+	$linksmeta[] = array(
+		'href' => 'shib13/sp/metadata.php', 
+		'text' => 'Hosted Shibboleth 1.3 Service Provider Metadata (automatically generated)');
+
+if ($config->getValue('enable.shib13-idp') === true)
+	$linksmeta[] = array(
+		'href' => 'shib13/idp/metadata.php', 
+		'text' => 'Hosted Shibboleth 1.3 Identity Provider Metadata (automatically generated)');
 	
 
 
+
+
 $linksdoc = array();
 
 $linksdoc[] = array(
diff --git a/www/resources/default.css b/www/resources/default.css
index 5b712f5576d3c241f6d7cd1b9c68ddfcf44d0d35..d6652cb735a3e8512269f6ec0a0090b9a3735827 100644
--- a/www/resources/default.css
+++ b/www/resources/default.css
@@ -234,4 +234,8 @@ th.rowtitle {
 }
 .enablebox tr.disabled td {
 	background: #ccc;
-}
\ No newline at end of file
+}
+
+.metadatabox {
+	overflow: scroll; border: 1px solid #eee; padding: 2px;
+}