diff --git a/conf/nginx.conf b/conf/nginx.conf
index 9a9b78c..08a19e5 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -70,13 +70,13 @@ location ^~ __PATH__/ {
     deny all;
   }
 
-  location ~ ^__PATH__/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+)\.php(?:$|/)$ {
+  location ~ ^__PATH__/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+)\.php(/.*|)$ {
     fastcgi_split_path_info ^(.+?\.php)(/.*|)$;
     set $path_info $fastcgi_path_info;
     try_files $fastcgi_script_name =404;
     include fastcgi_params;
-    
-    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+
+    fastcgi_param SCRIPT_FILENAME $request_filename;
     fastcgi_param PATH_INFO $path_info;
     fastcgi_param HTTPS on;
     # Avoid sending the security headers twice
@@ -95,19 +95,19 @@ location ^~ __PATH__/ {
   }
 
   location = __PATH__/core/js/oc.js {
-    rewrite ^ /index.php$request_uri;
+    rewrite ^ __PATH__/index.php$request_uri;
   }
 
   location = __PATH__/core/preview.png {
-    rewrite ^ /index.php$request_uri;
+    rewrite ^ __PATH__/index.php$request_uri;
   }
 
   location ~* ^__PATH__/(?:css|js)/ {
-    rewrite ^ /index.php$request_uri;
+    rewrite ^ __PATH__/index.php$request_uri;
   }
-  
+
   location ~* ^__PATH__/apps/theming/img/core/filetypes/ {
-    rewrite ^ /index.php$request_uri;
+    rewrite ^ __PATH__/index.php$request_uri;
   }
 
 
@@ -130,7 +130,7 @@ location ^~ __PATH__/ {
   }
 
   location ~* \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ {
-    try_files $uri /index.php$request_uri;
+    try_files $uri __PATH__/index.php$request_uri;
     # Optional: Don't log access to other assets
     access_log off;
   }