diff --git a/conf/nginx.conf b/conf/nginx.conf
index 1d97bcf..2d116c2 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -19,7 +19,12 @@ location __PATH__/ {
     fastcgi_param REMOTE_USER $remote_user;
     fastcgi_param PATH_INFO $fastcgi_path_info;
     fastcgi_param SCRIPT_FILENAME $request_filename;
-    fastcgi_read_timeout 600s;
+    fastcgi_read_timeout 900s;
+
+    # Buffering to survive heavy requests
+    fastcgi_buffers 16 16k;
+    fastcgi_buffer_size 32k;
+    fastcgi_busy_buffers_size 64k;
 
   }
 }