diff --git a/third-party/xhprof/xhprof_lib/display/xhprof.php b/third-party/xhprof/xhprof_lib/display/xhprof.php
index a57ec17..374b1bf 100644
--- a/third-party/xhprof/xhprof_lib/display/xhprof.php
+++ b/third-party/xhprof/xhprof_lib/display/xhprof.php
@@ -40,9 +40,9 @@
 
 /**
  * Our coding convention disallows relative paths in hrefs.
- * Get the base URL path from the SCRIPT_NAME.
+ * Get the base URL path from the REQUEST_URI.
  */
-$base_path = rtrim(dirname($_SERVER['SCRIPT_NAME']), '/\\');
+$base_path = rtrim(dirname($_SERVER['REQUEST_URI']), '/\\');
 
 
 /**
@@ -58,7 +58,7 @@
 function xhprof_include_js_css($ui_dir_url_path = null) {
 
   if (empty($ui_dir_url_path)) {
-    $ui_dir_url_path = rtrim(dirname($_SERVER['SCRIPT_NAME']), '/\\');
+    $ui_dir_url_path = rtrim(dirname($_SERVER['REQUEST_URI']), '/\\');
   }
 
   // style sheets
diff --git a/third-party/xhprof/xhprof_lib/utils/xhprof_runs.php b/third-party/xhprof/xhprof_lib/utils/xhprof_runs.php
index 2a22a5d..12e413e 100644
--- a/third-party/xhprof/xhprof_lib/utils/xhprof_runs.php
+++ b/third-party/xhprof/xhprof_lib/utils/xhprof_runs.php
@@ -152,7 +152,7 @@ function list_runs() {
         usort($files, create_function('$a,$b', 'return filemtime($b) - filemtime($a);'));
         foreach ($files as $file) {
             list($run,$source) = explode('.', basename($file));
-            echo '<li><a href="' . htmlentities($_SERVER['SCRIPT_NAME'])
+            echo '<li><a href="' . htmlentities($_SERVER['REQUEST_URI'])
                 . '?run=' . htmlentities($run) . '&source='
                 . htmlentities($source) . '">'
                 . htmlentities(basename($file)) . "</a><small> "