diff --git a/wp-settings.php b/wp-settings.php
index 50ce6f189..3fe18b386 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -40,6 +40,9 @@ if ( empty( $_SERVER['REQUEST_URI'] ) ) {
 		// If root then simulate that no script-name was specified
 		if (empty($_SERVER['PATH_INFO']))
 			$_SERVER['REQUEST_URI'] = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/')) . '/';
+		elseif ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
+			// Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
+			$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
 		else
 			$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];