--- old/usr/src/cmd/ssh/libssh/common/readconf.c	Thu Jan 17 15:17:54 2013
+++ new/usr/src/cmd/ssh/libssh/common/readconf.c	Thu Jan 17 15:17:54 2013
@@ -13,6 +13,7 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright 2013 Joyent, Inc.  All rights reserved.
  */
 
 #include "includes.h"
@@ -204,7 +205,8 @@
 	{ "stricthostkeychecking", oStrictHostKeyChecking },
 	{ "compression", oCompression },
 	{ "compressionlevel", oCompressionLevel },
-	{ "keepalive", oKeepAlives },
+	{ "tcpkeepalive", oKeepAlives },
+	{ "keepalive", oKeepAlives },				/* obsolete */
 	{ "numberofpasswordprompts", oNumberOfPasswordPrompts },
 	{ "loglevel", oLogLevel },
 	{ "dynamicforward", oDynamicForward },
--- old/usr/src/cmd/ssh/sshd/servconf.c	Thu Jan 17 15:17:54 2013
+++ new/usr/src/cmd/ssh/sshd/servconf.c	Thu Jan 17 15:17:54 2013
@@ -10,6 +10,7 @@
  */
 /*
  * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2013 Joyent, Inc.  All rights reserved.
  */
 
 #include "includes.h"
@@ -501,7 +502,8 @@
 	{ "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL },
 	{ "uselogin", sUseLogin, SSHCFG_GLOBAL },
 	{ "compression", sCompression, SSHCFG_GLOBAL },
-	{ "keepalive", sKeepAlives, SSHCFG_GLOBAL },
+	{ "tcpkeepalive", sKeepAlives, SSHCFG_GLOBAL },
+	{ "keepalive", sKeepAlives, SSHCFG_GLOBAL },		/* obsolete */
 	{ "allowtcpforwarding", sAllowTcpForwarding, SSHCFG_ALL },
 	{ "allowusers", sAllowUsers, SSHCFG_GLOBAL },
 	{ "denyusers", sDenyUsers, SSHCFG_GLOBAL },
--- old/usr/src/man/man4/ssh_config.4	Thu Jan 17 15:17:54 2013
+++ new/usr/src/man/man4/ssh_config.4	Thu Jan 17 15:17:54 2013
@@ -1,10 +1,11 @@
 '\" te
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved.
+.\" Copyright (c) 2013, Joyent, Inc. All Rights Reserved.
 .\" To view Portions Copyright for OpenSSH, the default path is /var/sadm/pkg/SUNWsshdr/install/copyright. If the Solaris operating environment has been installed anywhere other than the default, modify the specified path to access the file at the installed location.
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SSH_CONFIG 4 "Apr 20, 2009"
+.TH SSH_CONFIG 4 "Jan 17, 2013"
 .SH NAME
 ssh_config \- ssh configuration file
 .SH SYNOPSIS
@@ -528,7 +529,7 @@
 .sp
 .ne 2
 .na
-\fB\fBKeepAlive\fR\fR
+\fB\fBTCPKeepAlive\fR\fR
 .ad
 .sp .6
 .RS 4n
--- old/usr/src/man/man4/sshd_config.4	Thu Jan 17 15:17:54 2013
+++ new/usr/src/man/man4/sshd_config.4	Thu Jan 17 15:17:54 2013
@@ -1,9 +1,10 @@
 '\" te
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved.
+.\" Copyright (c) 2013, Joyent, Inc. All Rights Reserved.
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SSHD_CONFIG 4 "Mar 26, 2009"
+.TH SSHD_CONFIG 4 "Jan 17, 2013"
 .SH NAME
 sshd_config \- sshd configuration file
 .SH SYNOPSIS
@@ -169,9 +170,9 @@
 can be sent without \fBsshd\fR receiving any messages back from the client. If
 this threshold is reached while client alive messages are being sent,
 \fBsshd\fR disconnects the client, terminating the session. The use of client
-alive messages is very different from \fBKeepAlive\fR. The client alive
+alive messages is very different from \fBTCPKeepAlive\fR. The client alive
 messages are sent through the encrypted channel and therefore are not
-spoofable. The TCP keepalive option enabled by \fBKeepAlive\fR is spoofable.
+spoofable. The TCP keepalive option enabled by \fBTCPKeepAlive\fR is spoofable.
 The client alive mechanism is valuable when a client or server depend on
 knowing when a connection has become inactive.
 .sp
@@ -402,7 +403,7 @@
 .sp
 .ne 2
 .na
-\fB\fBKeepAlive\fR\fR
+\fB\fBTCPKeepAlive\fR\fR
 .ad
 .sp .6
 .RS 4n
