diff --git a/docs/en/administration/reverse-proxies.md b/docs/en/administration/reverse-proxies.md
index 47a6597e13..b093b58337 100644
--- a/docs/en/administration/reverse-proxies.md
+++ b/docs/en/administration/reverse-proxies.md
@@ -5,9 +5,17 @@ displayToc: true
 ---
 
 SCM-Manager can run behind any reverse proxy, but a few rules must be respected.
-The reverse proxy should not encode slashes and the `X-Forwarded-For` and `X-Forwarded-Host` headers must be send to SCM-Manager.
-If the proxy uses a different protocol as the SCM-Manager e.g. https on proxy and http on scm-manager, the `X-Forwarded-Proto` header must be send too.
-If `XSRF protection` is enabled on the SCM-Manager server, the cookie has to be `HttpOnly=false` and must not be modified.
+The reverse proxy should not encode slashes and the `X-Forwarded-For` and `X-Forwarded-Host` headers must be sent to
+SCM-Manager.
+If the proxy uses a different protocol as the SCM-Manager e.g. https on proxy and http on scm-manager, the
+`X-Forwarded-Proto` header must be send too.
+If `XSRF protection` is enabled on the SCM-Manager server, the cookie has to be `HttpOnly=false` and must not be
+modified.
+
+For SCM-Manager to work properly, the configuration `forwardHeadersEnabled` has to be set to `true` in the `config.yml`.
+To avoid timeouts due to caching in the reverse proxies, you also might want to increase the `idleTimeout` to a higher
+value, depending on the size of your repositories (you might want to start with `300000`, that would be five minutes).
+See the section about reverse proxies in [SCM-Server onfiguration](scm-server.md) for more information.
 
 ## nginx
 
diff --git a/docs/en/administration/scm-server.md b/docs/en/administration/scm-server.md
index ac6efcb7c2..3e7413b7cf 100644
--- a/docs/en/administration/scm-server.md
+++ b/docs/en/administration/scm-server.md
@@ -237,10 +237,15 @@ These HTTP headers are being appended to the requests which are redirected by yo
 this option set, your SCM-Server may run into connection issues. This option is disabled by default, because without a
 reverse proxy it could cause security issues.
 
+Many reverse proxies will also cache response streams. This can lead to timeouts, especially when working with large
+repositories. To avoid this, you might want to increase the `idleTimeout` to a higher value, depending on the size of
+your repositories (you might want to start with `300000`, that would be five minutes).
+
 **Example**
 
 ```yaml
 forwardHeadersEnabled: true
+idleTimeout: 300000
 ```
 
 ## Webapp