diff --git a/admin_manual/configuration_files/big_file_upload_configuration.rst b/admin_manual/configuration_files/big_file_upload_configuration.rst
index c7dbf38cb..a504a0f95 100644
--- a/admin_manual/configuration_files/big_file_upload_configuration.rst
+++ b/admin_manual/configuration_files/big_file_upload_configuration.rst
@@ -75,12 +75,18 @@ Apache with mod_fcgid
    Setting ``FcgidMaxRequestInMem`` significantly higher than normal may no longer be
    necessary, once bug #51747 is fixed.
 
-NGINX
+nginx
 ^^^^^
 * `client_max_body_size <http://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size>`_
 * `fastcgi_read_timeout <http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_read_timeout>`_
 * `client_body_temp_path <http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_temp_path>`_
 
+Since nginx 1.7.11 a new config option `fastcgi_request_buffering
+<https://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_request_buffering`_
+is availabe. Setting this option to ``fastcgi_request_buffering off;`` in your nginx config
+might help with timeouts during the upload. Furthermore it helps if you're running out of
+disc space on the tmp partition of your system.
+
 For more info how to configure nginx to raise the upload limits see also `this
 <https://github.com/owncloud/documentation/wiki/Uploading-files-up-to-16GB#configuring-nginx>`_
 wiki entry.
@@ -91,7 +97,7 @@ wiki entry.
    performance, place these on a separate hard drive that is dedicated to 
    swap and temp storage.
    
-If your site is behind a Nginx frontend (for example a loadbalancer): 
+If your site is behind a nginx frontend (for example a loadbalancer): 
 
 By default, downloads will be limited to 1GB due to ``proxy_buffering`` and ``proxy_max_temp_file_size`` on the frontend.
 
diff --git a/admin_manual/installation/nginx_examples.rst b/admin_manual/installation/nginx_examples.rst
index 2dfc9cbd9..0ea7a6997 100644
--- a/admin_manual/installation/nginx_examples.rst
+++ b/admin_manual/installation/nginx_examples.rst
@@ -293,6 +293,7 @@ Add *inside* the ``server{}`` block, as an example of a configuration:
          fastcgi_param PATH_INFO $fastcgi_path_info;
          fastcgi_param HTTPS on;
          fastcgi_pass php-handler;
+         fastcgi_request_buffering off; #Available since nginx 1.7.11
        
          # cache_purge
          fastcgi_cache_bypass $skip_cache;