Index: wp-settings.php
===================================================================
--- wp-settings.php	(revision 6635)
+++ wp-settings.php	(working copy)
@@ -49,7 +49,7 @@
 	$blog_id = 1;
 
 // Fix for IIS, which doesn't set REQUEST_URI
-if ( empty( $_SERVER['REQUEST_URI'] ) ) {
+if ( empty( $_SERVER['REQUEST_URI'] ) || substr( $_SERVER['SERVER_SOFTWARE'], 0, 13 ) == 'Microsoft-IIS' ) {
 
 	// IIS Mod-Rewrite
 	if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {

