diff -uNr concrete/controllers/dashboard/settings/controller.php concrete/controllers/dashboard/settings/controller.php
--- concrete/controllers/dashboard/settings/controller.php	2010-11-19 12:12:32.000000000 -0800
+++ concrete/controllers/dashboard/settings/controller.php	2011-01-07 17:45:42.000000000 -0800
@@ -11,7 +11,7 @@
 		$rewriteRules .= "RewriteBase " . DIR_REL . "/\n";
 		$rewriteRules .= "RewriteCond %{REQUEST_FILENAME} !-f\n";
 		$rewriteRules .= "RewriteCond %{REQUEST_FILENAME} !-d\n";
-		$rewriteRules .= "RewriteRule ^(.*)$ " . DISPATCHER_FILENAME . "/$1 [L]\n";
+		$rewriteRules .= "RewriteRule ^(.*)$ " . DISPATCHER_FILENAME . "?/$1 [L]\n";
 		$rewriteRules .= "</IfModule>";
 		return $rewriteRules;
 	}
@@ -957,4 +957,4 @@
 		ob_end_clean();
 		return $js;
 	}
-}
\ No newline at end of file
+}
diff -uNr concrete/libraries/request.php concrete/libraries/request.php
--- concrete/libraries/request.php	2010-11-19 12:12:33.000000000 -0800
+++ concrete/libraries/request.php	2011-01-07 20:23:03.000000000 -0800
@@ -35,7 +35,11 @@
 	// Thanks to Code Igniter for some of this code (in terms of getenv(), etc...)
 	
 	private static function parsePathFromRequest($var) {
-		$path = (isset($_SERVER[$var])) ? $_SERVER[$var] : @getenv($var);
+		if($var == 'argv') {
+			$path = (substr($_SERVER[argv][0], 0, 1) == "/") ? $_SERVER['argv'][0] : false;
+		} else {
+			$path = (isset($_SERVER[$var])) ? $_SERVER[$var] : @getenv($var);
+		}
 		if (!$path) {
 			return false;
 		}
@@ -73,6 +77,9 @@
 			if (!$path) {
 				$path = Request::parsePathFromRequest('PATH_INFO');
 			}
+                        if (!$path) {
+                                $path = Request::parsePathFromRequest('argv');
+                        }
 			if (!$path) {
 				$path = Request::parsePathFromRequest('SCRIPT_NAME');
 			}
@@ -329,4 +336,4 @@
 		$this->cPath = $path;
 	}
 
-}
\ No newline at end of file
+}