2 files changed, 5 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 76d07ee0d..66a338497 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 openssh (1:4.3p2-3) UNRELEASED; urgency=low
 
+  * Document KeepAlive->TCPKeepAlive renaming in sshd_config(5) (closes:
+    https://launchpad.net/bugs/50702).
   * debconf template translations:
     - Update French (thanks, Denis Barbier; closes: #368503).
     - Update Dutch (thanks, Bart Cornelis; closes: #375100).
diff --git a/sshd_config.5 b/sshd_config.5
index 841cb29d3..999e14a07 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -650,6 +650,9 @@ This avoids infinitely hanging sessions.
 .Pp
 To disable TCP keepalive messages, the value should be set to
 .Dq no .
+.Pp
+This option was formerly called
+.Cm KeepAlive .
 .It Cm UseDNS
 Specifies whether
 .Nm sshd