diff --git a/README.org b/README.org
index 3475aed..d4ccab2 100644
--- a/README.org
+++ b/README.org
@@ -80,14 +80,15 @@
 
     All configuration options are:
 
-    | Option      | Description                       | Type  | Default value | Example              |
-    |-------------+-----------------------------------+-------+---------------+----------------------|
-    | =address=   | Bind address of the server        | =str= | =127.0.0.1=   | =0.0.0.0=            |
-    | =port=      | Port on which the server listens  | =int= | =8000=        | =5000=               |
-    | =user=      | User under which the server runs  | =str= | =raincloud=   | =alice=              |
-    | =group=     | Group under which the server runs | =str= | =raincloud=   | =users=              |
-    | =cloudName= | Name of the raincloud             | =str= | =raincloud=   | =bobsCloud=          |
-    | =basePath=  | Base path of the raincloud        | =str= |               | =/var/lib/raincloud= |
+    | Option          | Description                       | Type  | Default value | Example              |
+    |-----------------+-----------------------------------+-------+---------------+----------------------|
+    | =address=       | Bind address of the server        | =str= | =127.0.0.1=   | =0.0.0.0=            |
+    | =port=          | Port on which the server listens  | =int= | =8000=        | =5000=               |
+    | =user=          | User under which the server runs  | =str= | =raincloud=   | =alice=              |
+    | =group=         | Group under which the server runs | =str= | =raincloud=   | =users=              |
+    | =cloudName=     | Name of the raincloud             | =str= | =raincloud=   | =bobsCloud=          |
+    | =basePath=      | Base path of the raincloud        | =str= |               | =/var/lib/raincloud= |
+    | =workerTimeout= | Gunicorn worker timeout           | =int= | =300=         | =360=                |
 
 *** Docker
 
@@ -105,6 +106,9 @@
 
     : $ docker run -p <local_port>:8000 -v <path_to_local_base_directory>:/var/www/raincloud -e "cloud_name=podcloud" raincloud:latest
 
+    Similarly the environment variable =worker_timeout= can be set to increase the Gunicorn worker timeout in seconds.
+    It's default value is =300=.
+
 ** Configuration
 
    /raincloud/ provides two configuration options which can be passed to =raincloud.create_app()=:
@@ -142,9 +146,17 @@
 ** Troubleshooting
 
    The filesize which can be uploaded may be limited by your web server.
-   When using /Nginx/ for example, the following configuration parameter can be used to increase the upload files size:
+   When using /Nginx/ for example, the following configuration parameter can be used to increase the upload files size or don't restrict it at all:
 
    : client_max_body_size 100M;
+   : client_max_body_size 0;
+
+   Similarly the maximum download file size can be disabled with:
+
+   : proxy_max_temp_file_size 0;
+
+   A network timeout may also be issued by a WSGI server.
+   With Gunicorn for example the timeout can be increased with the =--timeout= argument.
 
    Are you getting internal server errors?
    Check the directory permissions.