diff --git a/docs/simplesamlphp-changelog.txt b/docs/simplesamlphp-changelog.txt
index 94fe7be478b9ce89a929ed9923be7019c79dbf60..6ece741960f1ea50823fea78388d1a4e15966819 100644
--- a/docs/simplesamlphp-changelog.txt
+++ b/docs/simplesamlphp-changelog.txt
@@ -30,6 +30,7 @@ See the upgrade notes for specific information about upgrading.
   * Removed metadata send functionality from old SP code.
   * Removed bin/test.php and www/admin/test.php.
   * Removed metashare.
+  * Removed www/auth/login-auto.php.
 
 ### SAML 2 IdP
 
diff --git a/lib/SimpleSAML/IdP.php b/lib/SimpleSAML/IdP.php
index a16ef17622d1faaea190ea50fd0e7b754a7c01bd..3239426b097cd3da2f1927b050ebfdb2bcaee423 100644
--- a/lib/SimpleSAML/IdP.php
+++ b/lib/SimpleSAML/IdP.php
@@ -242,7 +242,6 @@ class SimpleSAML_IdP {
 
 		$candidates = array(
 			'auth/login-admin.php' => 'login-admin',
-			'auth/login-auto.php' => 'login-auto',
 			'auth/login-cas-ldap.php' => 'login-cas-ldap',
 			'auth/login-feide.php' => 'login-feide',
 			'auth/login-ldapmulti.php' => 'login-ldapmulti',
diff --git a/www/auth/login-auto.php b/www/auth/login-auto.php
deleted file mode 100644
index e947506ec64cce17af64cf4536a4b7422929f040..0000000000000000000000000000000000000000
--- a/www/auth/login-auto.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/*
- * This php script implements an automatic login handler which gives the user
- * a default set of attributes.
- *
- * To use this login handler, the 'auth.auto.enable' configuration option
- * must be set to true. The attributes which are returned is configured in the
- * 'auth.auto.attributes' configuration option.
- *
- * There are also two other options for use in simulation:
- *  - 'auth.auto.ask_login' - ask for username and password.
- *  - 'auth.auto.delay_login' - delay the login process for the given number
- *    of milliseconds.
- *
- * See 'config/config-template.php' for documentation about these configuration
- * options.
- */
-
-require_once('../../www/_include.php');
-
-/* Load the configuration. */
-$config = SimpleSAML_Configuration::getInstance();
-$autoconfig = SimpleSAML_Configuration::getConfig('config-login-auto.php');
-
-
-$enable = (bool)$autoconfig->getValue('auth.auto.enable');
-$attributes = $autoconfig->getValue('auth.auto.attributes');
-$ask_login = (bool)$autoconfig->getValue('auth.auto.ask_login');
-$delay_login = (int)$autoconfig->getValue('auth.auto.delay_login');
-
-/* Verify that this authentication handler is enabled. */
-if(!$enable) {
-	throw new Exception('login-auto not enabled: You attempted to use the login-auto authentication handler, but this handler isn\'t enabled in the configuration. If you want to enable this authentication handler, set \'auth.auto.enable\' to true.');
-}
-
-/* Verify that the 'auth.auto.attributes' option is configured. */
-if(!is_array($attributes)) {
-	throw new Exception('login-auto not configured: The login-auto authentication handler is enabled, but no attributes are configured. Please set \'auth.auto.attributes\' to the attributes you want to give users.');
-}
-
-
-/* Check if we should display a login page. */
-if($ask_login && !array_key_exists('username', $_POST)) {
-	/* Show login page. */
-
-	$t = new SimpleSAML_XHTML_Template($config, 'login.php', 'login');
-
-	$t->data['header'] = 'simpleSAMLphp: Enter username and password';
-	$t->data['relaystate'] = $_REQUEST['RelayState'];
-
-	$t->show();
-	exit(0);
-}
-
-
-/* Delay the execution of the script to simulate the login process taking
- * time.
- */
-usleep($delay_login * 1000);
-
-
-/* Load the session of the current user. */
-$session = SimpleSAML_Session::getInstance();
-if($session == NULL) {
-	SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
-}
-
-/* Set the user as authenticated and add the attributes from the
- * configuration.
- */
-$session->doLogin('login-auto');
-
-$session->setAttributes($attributes);
-$session->setNameID(array(
-	'value' => SimpleSAML_Utilities::generateID(),
-	'Format' => 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'));
-
-/* Return the user to the page set in the RelayState parameter. */
-$returnto = $_REQUEST['RelayState'];
-SimpleSAML_Utilities::redirect($returnto);
-
-?>