diff --git a/index.php b/index.php
index c6776b11bb..5f13064dab 100644
--- a/index.php
+++ b/index.php
@@ -113,14 +113,15 @@ function main()
         $_lighty_url = @parse_url($_lighty_url);
 
         if ($_lighty_url['path'] != '/index.php' && $_lighty_url['path'] != '/') {
-            $_SERVER['QUERY_STRING'] = 'p='.substr($_lighty_url['path'], 1);
+            $_lighty_path = preg_replace('/^'.preg_quote(common_config('site','path')).'\//', '', substr($_lighty_url['path'], 1));
+            $_SERVER['QUERY_STRING'] = 'p='.$_lighty_path;
             if ($_lighty_url['query'])
                 $_SERVER['QUERY_STRING'] .= '&'.$_lighty_url['query'];
             parse_str($_lighty_url['query'], $_lighty_query);
             foreach ($_lighty_query as $key => $val) {
                 $_GET[$key] = $_REQUEST[$key] = $val;
             }
-            $_GET['p'] = $_REQUEST['p'] = substr($_lighty_url['path'], 1);
+            $_GET['p'] = $_REQUEST['p'] = $_lighty_path;
         }
     }
     $_SERVER['REDIRECT_URL'] = preg_replace("/\?.+$/", "", $_SERVER['REQUEST_URI']);