diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc
index f98df0759..595d22330 100644
--- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc
@@ -2087,6 +2087,17 @@ class MyFallbackProvider implements FallbackProvider {
 }
 ----
 
+=== Zuul Timeouts
+
+If you want to configure the socket timeouts and read timeouts for requests proxied through
+Zuul there are two options based on your configuration.
+
+If Zuul is using service discovery than you need to configure these timeouts via Ribbon properties,
+`ribbon.ReadTimeout` and `ribbon.SocketTimeout`.
+
+If you have configured Zuul routes by specifying URLs than you will need to use
+`zuul.host.connect-timeout-millis` and `zuul.host.socket-timeout-millis`.
+
 [[zuul-redirect-location-rewrite]]
 === Rewriting `Location` header