diff --git a/redis.conf b/redis.conf
index fdabda06..de3aa168 100644
--- a/redis.conf
+++ b/redis.conf
@@ -144,6 +144,10 @@ slave-serve-stale-data yes
 # The following option sets a timeout for both Bulk transfer I/O timeout and
 # master data or ping response timeout. The default value is 60 seconds.
 #
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
 # repl-timeout 60
 
 ################################## SECURITY ###################################