diff --git a/ChangeLog b/ChangeLog
index ee05bbc80..93cabb88f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,9 @@
    - markus@cvs.openbsd.org 2001/11/07 22:10:28
      [ssh-dss.c ssh-rsa.c]
      missing free and sync dss/rsa code.
+   - markus@cvs.openbsd.org 2001/11/07 22:12:01
+     [sshd.8]
+     s/Keepalive/KeepAlive/; from openbsd@davidkrause.com
 
 20011109
  - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)
@@ -6842,4 +6845,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1644 2001/11/12 00:03:35 djm Exp $
+$Id: ChangeLog,v 1.1645 2001/11/12 00:04:05 djm Exp $
diff --git a/sshd.8 b/sshd.8
index c3a2e1ee4..d7e5937cf 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.153 2001/09/27 17:53:24 camield Exp $
+.\" $OpenBSD: sshd.8,v 1.154 2001/11/07 22:12:01 markus Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -402,11 +402,11 @@ reached while client alive messages are being sent,
 .Nm
 will disconnect the client, terminating the session. It is important
 to note that the use of client alive messages is very different from
-.Cm Keepalive
+.Cm KeepAlive
 (below). The client alive messages are sent through the
 encrypted channel and therefore will not be spoofable. The TCP keepalive
 option enabled by
-.Cm Keepalive
+.Cm KeepAlive
 is spoofable. The client alive mechanism is valuable when the client or
 server depend on knowing when a connection has become inactive.
 .Pp