diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 54b9309a0..3c48b5f30 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -494,21 +494,6 @@ This specifies a URL associated with the stream.
 .TP
 .B genre <genre>
 This specifies the genre(s) of the stream.
-.SH OPTIONAL TCP KEEPALIVE PARAMETERS
-.TP
-.B tcp_keep_alive <yes or no>
-Enable tcp keepalive on new client connections. (default is "no")
-.TP
-.B tcp_keep_alive_idle <seconds>
-Time in seconds since the last communication on the connection and before
-the keepalive probing is started. (default is 7200 seconds)
-.TP
-.B tcp_keep_alive_interval <seconds>
-Interval in seconds between keepalive probes, once a probe started. (default is 75 seconds)
-.TP
-.B tcp_keep_alive_count <number of times>
-Number of failed probes before the connection is pronounced dead and
-the connection is closed. (default is 9 times)
 .SH FILES
 .TP
 .BI ~/.mpdconf
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index e4b4d29a9..37fb8a14b 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -416,36 +416,6 @@ input {
 #
 ###############################################################################
 
-# Client TCP keep alive #######################################################
-#
-# For clients connected by TCP on supported platforms.
-# Allows detection of dangling connections due to clients disappearing from
-# the network without closing their connections.
-#
-# This is not usually necessary but can be useful in cases such as wifi connectected
-# clients that go in and out of network range or turn off wifi without closing their
-# connections. Combined with low max_connections this can soon cause clients to not
-# be able to connect.
-#
-#
-# Enable tcp keepalive on new client connections (default is "no")
-#
-#tcp_keep_alive "no"
-#
-# Time in seconds since the last communication on the connection and before
-# the keepalive probing is started. (default is 7200 seconds)
-#tcp_keep_alive_idle "7200"
-#
-# Interval in seconds between keepalive probes, once a probe started.
-# (default is 75 seconds)
-#tcp_keep_alive_interval "75"
-#
-# Number of failed probes before the connection is pronounced dead and
-# the connection is closed. (default is 9 times)
-#tcp_keep_alive_count "9"
-#
-###############################################################################
-
 # Character Encoding ##########################################################
 #
 # If file or directory names do not display correctly for your locale then you