2 files changed, 3 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 8d05772d0..0d0363119 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 openssh (1:4.2p1-9) UNRELEASED; urgency=low
 
+  * Rename KeepAlive to TCPKeepAlive in default sshd_config
+    (closes: #349896).
   * debconf template translations:
     - Update Italian (thanks, Luca Monducci; closes: #360348).
     - Add Galician (thanks, Jacobo Tarrio; closes: #361220).
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index efd9cf484..ccacb411a 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -265,7 +265,7 @@ X11Forwarding yes
 X11DisplayOffset 10
 PrintMotd no
 PrintLastLog yes
-KeepAlive yes
+TCPKeepAlive yes
 #UseLogin no
 
 #MaxStartups 10:30:60