diff --git a/HISTORY.rst b/HISTORY.rst
index c02f7ae7db..a850558809 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -10,6 +10,7 @@
   issue #489.
 - Update dropzone.js' timeout from 30 seconds to 120 to allow upload
   of large files on slow connections.
+- Increase gunicorn's timeout from 30 seconds to 120.
 
 3.0.1 (2018-07-08)
 =================
diff --git a/docker/etc/supervisor/mayan.conf b/docker/etc/supervisor/mayan.conf
index 121aab92e7..877e7313aa 100644
--- a/docker/etc/supervisor/mayan.conf
+++ b/docker/etc/supervisor/mayan.conf
@@ -1,7 +1,7 @@
 [program:mayan-gunicorn]
 autorestart = false
 autostart = true
-command = /bin/bash -c "cd ${MAYAN_PYTHON_DIR}; gunicorn -w ${MAYAN_GUNICORN_WORKERS} mayan.wsgi --max-requests 500 --max-requests-jitter 50 --worker-class gevent --bind 0.0.0.0:8000  --env DJANGO_SETTINGS_MODULE=${MAYAN_SETTINGS_MODULE}"
+command = /bin/bash -c "cd ${MAYAN_PYTHON_DIR}; gunicorn -w ${MAYAN_GUNICORN_WORKERS} mayan.wsgi --max-requests 500 --max-requests-jitter 50 --worker-class gevent --bind 0.0.0.0:8000  --env DJANGO_SETTINGS_MODULE=${MAYAN_SETTINGS_MODULE}" --timeout 120
 redirect_stderr = true
 stderr_logfile = /dev/fd/2
 stderr_logfile_maxbytes = 0
diff --git a/docs/topics/deploying.rst b/docs/topics/deploying.rst
index deacf22578..a145818970 100644
--- a/docs/topics/deploying.rst
+++ b/docs/topics/deploying.rst
@@ -87,7 +87,7 @@ Create the supervisor file at ``/etc/supervisor/conf.d/mayan.conf``::
     [program:mayan-gunicorn]
     autorestart = true
     autostart = true
-    command = /opt/mayan-edms/bin/gunicorn -w 2 mayan.wsgi --max-requests 500 --max-requests-jitter 50 --worker-class gevent --bind 0.0.0.0:8000
+    command = /opt/mayan-edms/bin/gunicorn -w 2 mayan.wsgi --max-requests 500 --max-requests-jitter 50 --worker-class gevent --bind 0.0.0.0:8000 --timeout 120
     user = mayan
 
     [program:mayan-worker-fast]