diff --git a/docs/source/simplesamlphp-googleapps.xml b/docs/source/simplesamlphp-googleapps.xml
index 60e11f6a582fb3009b8ac0d893f8dc98da599095..41fddc068faec4928f919bd60a57fd70b6fbf02c 100644
--- a/docs/source/simplesamlphp-googleapps.xml
+++ b/docs/source/simplesamlphp-googleapps.xml
@@ -399,7 +399,7 @@ An optional company name []:</screen>
     your server. The RelayState parameter of the endpoint is the URL where the
     user is redirected after successfull logout. Recommended value:</para>
 
-    <literallayout>http://dev2.andreas.feide.no/simplesaml/saml2/idp/initSLO.php?RelayState=/simplesaml/logout.html</literallayout>
+    <literallayout>http://dev2.andreas.feide.no/simplesaml/saml2/idp/initSLO.php?RelayState=/simplesaml/logout.php</literallayout>
 
     <para>again, using the host name of your IdP server.</para>
 
diff --git a/www/aselect/handler.php b/www/aselect/handler.php
index 64ada3a9418098506cbe36ceaa6e5b3b79ec32af..b1939bba3503b075a2e046fcd109d404927c5a53 100644
--- a/www/aselect/handler.php
+++ b/www/aselect/handler.php
@@ -69,10 +69,10 @@ $as_metadata = array(
 			'app_level' => '10',
 			'tgt_exp_time' => '1194590521000',
 #			'auth' => '/' . $config->getBaseURL() . '/auth/login.php',
-#			'logout' => '/' . $config->getBaseURL() . 'logout.html',
+#			'logout' => '/' . $config->getBaseURL() . 'logout.php',
 			'auth' => '/' . $config->getBaseURL() . '/saml2/sp/initSSO.php',
 			'logout' => '/' . $config->getBaseURL() . '/saml2/sp/initSLO.php',
-			'loggedout_url' => '/' . $config->getBaseURL() . 'logout.html',
+			'loggedout_url' => '/' . $config->getBaseURL() . 'logout.php',
 		),
 		'remote' => array(
 			// so far the IDP bridging is statically configured to the first one in
diff --git a/www/example-simple/saml2-example.php b/www/example-simple/saml2-example.php
index b656e839957bab782883e3f0ec73c828008ad8a0..e1cf0f0fc9e20036f6f79c0fad88f026f3477724 100644
--- a/www/example-simple/saml2-example.php
+++ b/www/example-simple/saml2-example.php
@@ -56,7 +56,7 @@ $t->data['sessionsize'] = $session->getSize();
 $t->data['attributes'] = $attributes;
 $t->data['icon'] = 'bino.png';
 $t->data['logouturl'] = '/' . $config->getBaseURL() . 'saml2/sp/initSLO.php?RelayState=/' .
-	$config->getBaseURL() . 'logout.html';
+	$config->getBaseURL() . 'logout.php';
 $t->show();