diff --git a/modules/core/www/frontpage_auth.php b/modules/core/www/frontpage_auth.php
index 0620fc21fd2609c1728c396804442ad3145a93d3..37d07180fb527adba1f5eb1a70047d4a458465f2 100644
--- a/modules/core/www/frontpage_auth.php
+++ b/modules/core/www/frontpage_auth.php
@@ -31,12 +31,12 @@ $links_auth[] = array(
 
 if ($config->getValue('enable.saml20-sp') === true)
 	$links_auth[] = array(
-		'href' => 'example-simple/saml2-example.php', 
+		'href' => SimpleSAML_Utilities::getBaseURL() . 'example-simple/saml2-example.php',
 		'text' => '{core:frontpage:link_saml2example}');
 
 if ($config->getValue('enable.shib13-sp') === true)
 	$links_auth[] = array(
-		'href' => 'example-simple/shib13-example.php', 
+		'href' => SimpleSAML_Utilities::getBaseURL() . 'example-simple/shib13-example.php',
 		'text' => '{core:frontpage:link_shib13example}');
 
 
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index faaf2f8fbd01846ac8165637f21575916c63e500..7bd4b0462437bbb66be8f580ea5bcf34d7db6094 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -34,17 +34,17 @@ $links_federation = array();
 
 
 $links_config[] = array(
-	'href' => 'example-simple/hostnames.php?dummy=1', 
+	'href' => SimpleSAML_Utilities::getBaseURL() . 'example-simple/hostnames.php?dummy=1',
 	'text' => '{core:frontpage:link_diagnostics}'
 );
 
 $links_config[] = array(
-	'href' => 'admin/phpinfo.php', 
+	'href' => SimpleSAML_Utilities::getBaseURL() . 'admin/phpinfo.php',
 	'text' => '{core:frontpage:link_phpinfo}'
 );
 
 $links_config[] = array(
-	'href' => 'admin/config.php',
+	'href' => SimpleSAML_Utilities::getBaseURL() . 'admin/config.php',
 	'text' => '{core:frontpage:link_configcheck}',
 );
 
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index fd4194aafc49600f8beb79844c06f4c3cdfeb241..c681625fa2888e0088d6094f9f2221af32a9a1ac 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -46,7 +46,7 @@ if ($publishURL !== NULL) {
 	foreach($metadataSources as $name => $url) {
 		if(!$config->getBoolean('enable.' . $name, FALSE)) continue;
 
-		$url = SimpleSAML_Utilities::resolveURL($url);
+		$url = SimpleSAML_Utilities::getBaseURL() . $url;
 		$linkTarget = SimpleSAML_Utilities::addURLparameter($publishURL, array('url' => $url));
 		$links_federation[] = array(
 			'href' => $linkTarget,
@@ -57,12 +57,12 @@ if ($publishURL !== NULL) {
 
 
 $links_federation[] = array(
-	'href' => 'admin/metadata.php', 
+	'href' => SimpleSAML_Utilities::getBaseURL() . 'admin/metadata.php',
 	'text' => '{core:frontpage:link_meta_overview}'
 );
 
 $links_federation[] = array(
-	'href' => 'admin/metadata-converter.php',
+	'href' => SimpleSAML_Utilities::getBaseURL() . 'admin/metadata-converter.php',
 	'text' => '{core:frontpage:link_xmlconvert}',
 );