diff --git a/bin/cppcms_run b/bin/cppcms_run
index 3e9fdd1b..22bfe3e1 100755
--- a/bin/cppcms_run
+++ b/bin/cppcms_run
@@ -323,12 +323,7 @@ elif [ "$API" == "scgi" ] ; then
 
 cat >>$CONFIG_FILE <<EOF
 
-	set \$path_info "";
-	if ( \$document_uri ~ ^$SCRIPT(.*)\$ ) {
-		set \$path_info \$1;
-	}
-
-	location ~ ^$SCRIPT.*$ {
+	location ~ ^$SCRIPT(/.*)?$ {
 		scgi_pass $SERVICE_POINT;
 		scgi_param  QUERY_STRING       \$query_string;
 		scgi_param  REQUEST_METHOD     \$request_method;
@@ -336,7 +331,7 @@ cat >>$CONFIG_FILE <<EOF
 		scgi_param  CONTENT_LENGTH     \$content_length;
 
 		scgi_param  SCRIPT_NAME        $SCRIPT;
-		scgi_param  PATH_INFO	       \$path_info;
+		scgi_param  PATH_INFO	       \$1;
 		scgi_param  REQUEST_URI        \$request_uri;
 		scgi_param  DOCUMENT_URI       \$document_uri;
 		scgi_param  DOCUMENT_ROOT      \$document_root;