diff --git a/config-templates/config.php b/config-templates/config.php
index e19766880f00cd417f290cd843dd780a69a32582..b26a8cb19ef4b63426d2bf2f95fd9917dce79fd3 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -137,11 +137,11 @@ $config = array (
 	 * To enable the SAML 2.0 IdP Discovery service for a SAML 2.0 SP, you need to set the
 	 * default-saml20-idp to be null, like this:
 	 *
-	 * 		'default-saml20-idp'	=> null,
+	 * 		'default-saml20-idp' => NULL,
 	 *
 	 */
-	'default-saml20-idp'	=> 'max.feide.no',
-	'default-shib13-idp'	=> 'urn:mace:switch.ch:aaitest:dukono.switch.ch',
+	'default-saml20-idp' => 'https://openidp.feide.no',
+	'default-shib13-idp' => NULL,
 	
 	/*
 	 * IdP Discovery service look configuration. 
diff --git a/metadata-templates/saml20-idp-remote.php b/metadata-templates/saml20-idp-remote.php
index 34f3c51e1811bd0abc1d5cb8f91662e45f8d4c39..db6157a4a9ce9f6df9eecbe34d4a4ea0baa93ded 100644
--- a/metadata-templates/saml20-idp-remote.php
+++ b/metadata-templates/saml20-idp-remote.php
@@ -10,7 +10,15 @@
 
 $metadata = array( 
 
-
+	'https://openidp.feide.no' =>  array(
+		'name'                 => 'Feide RnD OpenIdP',
+		'description'          => 'Here you can login with your account on Feide RnD OpenID. If you do not already have an account on this identity provider, you can create a new one by following the create new account link and follow the instructions.',
+		'SingleSignOnService'  => 'https://openidp.feide.no/simplesaml/saml2/idp/SSOService.php',
+		'SingleLogoutService'  => 'https://openidp.feide.no/simplesaml/saml2/idp/SingleLogoutService.php',
+		'certFingerprint'      => 'c9ed4dfb07caf13fc21e0fec1572047eb8a7a4cb'
+	),
+	
+	
 	/*
 	 * Example simpleSAMLphp SAML 2.0 IdP
 	 */