diff --git a/lib/SimpleSAML/Bindings/SAML20/HTTPPost.php b/lib/SimpleSAML/Bindings/SAML20/HTTPPost.php
index 924ed9afe343628b28032bbc4de5d401197c9414..33c2a00a95d141a48d3d95a77ada00e19a71be90 100644
--- a/lib/SimpleSAML/Bindings/SAML20/HTTPPost.php
+++ b/lib/SimpleSAML/Bindings/SAML20/HTTPPost.php
@@ -84,8 +84,8 @@ class SimpleSAML_Bindings_SAML20_HTTPPost {
 		$publiccert = "/home/as/erlang/feide2/cert/server.crt";
 				*/
 		
-		$privatekey = $this->configuration->getValue('basedir') . '/cert/' . $idpmd['privatekey'];
-		$publiccert = $this->configuration->getValue('basedir') . '/cert/' . $idpmd['certificate'];
+		$privatekey = $this->configuration->getBaseDir() . '/cert/' . $idpmd['privatekey'];
+		$publiccert = $this->configuration->getBaseDir() . '/cert/' . $idpmd['certificate'];
 
 		if (!file_exists($privatekey))
 			throw new Exception('Could not find private key file [' . $privatekey . '] which is needed to sign the authentication response');
diff --git a/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php b/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php
index 0b4b07206d1955173bd132ba7f267daf603b751e..e12b54da125b242d236e4ffa8b4f467ea5dff04f 100644
--- a/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php
+++ b/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php
@@ -77,8 +77,8 @@ class SimpleSAML_Bindings_Shib13_HTTPPost {
 			throw new Exception('Could not find AssertionConsumerService for SP entity ID [' . $spentityid. ']. ' . 
 				'Claimed ACS is: ' . (isset($claimedacs) ? $claimedacs : 'N/A'));
 	
-		$privatekey = $this->configuration->getValue('basedir') . '/cert/' . $idpmd['privatekey'];
-		$publiccert = $this->configuration->getValue('basedir') . '/cert/' . $idpmd['certificate'];
+		$privatekey = $this->configuration->getBaseDir() . '/cert/' . $idpmd['privatekey'];
+		$publiccert = $this->configuration->getBaseDir() . '/cert/' . $idpmd['certificate'];
 
 		
 		if (strstr($claimedacs, $destination) == 0) {
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 37c93f1091355fa7b35d2deaefd50eaff95ba91c..e558e55315447e92e1b3ca739575c00bc690a61b 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -69,20 +69,20 @@ class SimpleSAML_XHTML_Template {
 	
 	private function includeAtTemplateBase($file) {
 		$data = $this->data;
-		$filebase = $this->configuration->getValue('basedir') . $this->configuration->getValue('templatedir');
+		$filebase = $this->configuration->getBaseDir() . $this->configuration->getValue('templatedir');
 		include($filebase . $file);
 	}
 
 	private function includeAtLanguageBase($file) {
 		$data = $this->data;
-		$filebase = $this->configuration->getValue('basedir') . $this->configuration->getValue('templatedir') . $this->getLanguage() . '/' ;
+		$filebase = $this->configuration->getBaseDir() . $this->configuration->getValue('templatedir') . $this->getLanguage() . '/' ;
 		include($filebase . $file);
 	}
 
 	
 	public function show() {
 		$data = $this->data;
-		$filename = $this->configuration->getValue('basedir') . $this->configuration->getValue('templatedir') . $this->getLanguage() . '/' . 
+		$filename = $this->configuration->getBaseDir() . $this->configuration->getValue('templatedir') . $this->getLanguage() . '/' . 
 			$this->template;
 		
 		
@@ -92,7 +92,7 @@ class SimpleSAML_XHTML_Template {
 //				echo 'Could not find template file [' . $this->template . '] at [' . $filename . ']';
 //				exit(0);
 		
-			$filename = $this->configuration->getValue('basedir') . $this->configuration->getValue('templatedir') .  
+			$filename = $this->configuration->getBaseDir() . $this->configuration->getValue('templatedir') .  
 				$this->configuration->getValue('language.default') . '/' . $this->template;
 
 
diff --git a/lib/SimpleSAML/XML/AttributeFilter.php b/lib/SimpleSAML/XML/AttributeFilter.php
index df72c5ba155e6276102523667730f142bd65f94b..6ce5599aeedae4c14e883a69381c797eaa1ef188 100644
--- a/lib/SimpleSAML/XML/AttributeFilter.php
+++ b/lib/SimpleSAML/XML/AttributeFilter.php
@@ -27,7 +27,7 @@ class SimpleSAML_XML_AttributeFilter {
 
 	public function namemap($map) {
 		
-		$mapfile = $this->configuration->getValue('basedir') . $this->configuration->getValue('attributenamemapdir') . $map . '.php';
+		$mapfile = $this->configuration->getBaseDir() . $this->configuration->getValue('attributenamemapdir') . $map . '.php';
 		if (!file_exists($mapfile)) throw new Exception('Could not find attributemap file: ' . $mapfile);
 		
 		include($mapfile);
diff --git a/lib/SimpleSAML/XML/MetaDataStore.php b/lib/SimpleSAML/XML/MetaDataStore.php
index ecba5b02fa1107ad0f7245b79a27e1d0c182b914..d5ece29f2acc40434d23835edbe00ef908d4fabf 100644
--- a/lib/SimpleSAML/XML/MetaDataStore.php
+++ b/lib/SimpleSAML/XML/MetaDataStore.php
@@ -36,7 +36,7 @@ class SimpleSAML_XML_MetaDataStore {
 				throw new Exception('Trying to load illegal set of Meta data [' . $set . ']');
 		}
 		
-		$metadatasetfile = $this->configuration->getValue('basedir') . '/' . 
+		$metadatasetfile = $this->configuration->getBaseDir() . '/' . 
 			$this->configuration->getValue('metadatadir') . '/' . $set . '.php';
 		
 		
diff --git a/www/auth/login-ldapmulti.php b/www/auth/login-ldapmulti.php
index 43ac2ae66cb2a3d5f91883603b8ffbc913c54ece..f95b29be4884d90661a9b7cfa7102063ce03928f 100644
--- a/www/auth/login-ldapmulti.php
+++ b/www/auth/login-ldapmulti.php
@@ -16,7 +16,7 @@ $metadata = new SimpleSAML_XML_MetaDataStore($config);
 $session = SimpleSAML_Session::getInstance();
 $logger = new SimpleSAML_Logger();
 
-$ldapconfigfile = $config->getValue('basedir') . 'config/ldapmulti.php';
+$ldapconfigfile = $config->getBaseDir() . 'config/ldapmulti.php';
 require_once($ldapconfigfile);
 
 
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index b99b5bb5b1dd661f3c9b0c1be41f8e6a71cb0cf9..c756cd67283f93ad302e6f112f64fc0d47d5a9e2 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -19,7 +19,7 @@ try {
 	$idpmeta = isset($_GET['idpentityid']) ? $_GET['idpentityid'] : $metadata->getMetaDataCurrent('saml20-idp-hosted');
 	$idpentityid = isset($_GET['idpentityid']) ? $_GET['idpentityid'] : $metadata->getMetaDataCurrentEntityID('saml20-idp-hosted');
 	
-	$publiccert = $config->getValue('basedir') . '/cert/' . $idpmeta['certificate'];
+	$publiccert = $config->getBaseDir() . '/cert/' . $idpmeta['certificate'];
 
 	if (!file_exists($publiccert)) 
 		throw new Exception('Could not find certificate [' . $publiccert . '] to attach to the authentication resposne');