diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index 17fc81d164255e9c3055854dcf0f8f8af288aaa3..3d5f5b40659ff65d321df094ce997ab1dbe36682 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -148,7 +148,11 @@ class SimpleSAML_Configuration {
 		assert('is_string($configSet)');
 
 		if (!array_key_exists($configSet, self::$configDirs)) {
-			throw new Exception('Configuration set \'' . $configSet . '\' not initialized.');
+			if ($configSet !== 'simplesaml') {
+				throw new Exception('Configuration set \'' . $configSet . '\' not initialized.');
+			} else {
+				self::$configDirs['simplesaml'] = dirname(dirname(dirname(__FILE__))) . '/config';
+			}
 		}
 
 		$dir = self::$configDirs[$configSet];
diff --git a/www/_include.php b/www/_include.php
index f7446668e3df998573f500495148003d4022826a..810f919d4af0e2f684d6a7918c84c03b097d4c29 100644
--- a/www/_include.php
+++ b/www/_include.php
@@ -89,8 +89,6 @@ if (!file_exists($configdir . '/config.php')) {
 	exit(1);
 }
 
-SimpleSAML_Configuration::setConfigDir($configdir);
-
 /* Make sure that the session is initialized before any output. */
 SimpleSAML_Session::getInstance();
 
diff --git a/www/example-simple/verysimple.php b/www/example-simple/verysimple.php
index 44e382edf43e85b41951927ec1cf2a7c0fb0754e..1438c2a52c32e526c4696f7ef4b16c3606f0af55 100644
--- a/www/example-simple/verysimple.php
+++ b/www/example-simple/verysimple.php
@@ -14,10 +14,6 @@
  */
 require_once('../../lib/_autoload.php');
 
-/* We need to tell simpleSAMLphp where the configuration is located. */
-SimpleSAML_Configuration::setConfigDir('../../config');
-
-
 
 /* This handles logout requests. */
 if (array_key_exists('logout', $_REQUEST)) {