diff --git a/wp-login.php b/wp-login.php
index 1bcd034bf..e512e7521 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -10,6 +10,9 @@ header('Cache-Control: no-cache, must-revalidate');
 header('Pragma: no-cache');
 
 // If someone has moved WordPress let's try to detect it
+if ( isset( $_SERVER['PATH_INFO'] ) )
+	$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
+
 if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') )
 	update_option('siteurl', dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );