diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7f19de92..8cfc8831 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -51,13 +51,16 @@ server {
 		alias /usr/local/lib/owncloud/;
 	}
 
-	location ~ /owncloud/.*\.php {
+	location ~ ^/owncloud/(.+?\.php)/? {
+		fastcgi_split_path_info ^/owncloud/(.+?\.php)(/?.*)$;
+		set $path_info $fastcgi_path_info;
+#		try_files $fastcgi_script_name = 404;
 		include fastcgi_params;
-		fastcgi_split_path_info ^/owncloud(/.*)()$;
-		fastcgi_index index.php;
 		fastcgi_param SCRIPT_FILENAME /usr/local/lib/owncloud/$fastcgi_script_name;
+		fastcgi_param PATH_INFO $path_info;
+		fastcgi_param HTTPS on;
+		fastcgi_param SCRIPT_NAME /owncloud/$fastcgi_script_name;
 		fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock;
-		client_max_body_size 20M;
 	}
 
 	location ~ ^/(data|config|\.ht|db_structure\.xml|README) {