diff --git a/redis.conf b/redis.conf
index b71a494e8..8e28c755b 100644
--- a/redis.conf
+++ b/redis.conf
@@ -39,6 +39,17 @@ port 6379
 # Close the connection after a client is idle for N seconds (0 to disable)
 timeout 0
 
+# TCP keepalive.
+#
+# When this option is set to a non-zero value, SO_KEEPALIVE option will be
+# enabled in order to send ACKs just to avoid connection drops or to detect
+# dead peers.
+#
+# The value you specify with this option is the period (in seconds) we use
+# in order to refresh the connection with TCP ACKs, however the period is
+# only actually set on Linux. Other kernels will use the system-wide default.
+tcp-keepalive 0
+
 # Specify the server verbosity level.
 # This can be one of:
 # debug (a lot of information, useful for development/testing)