diff --git a/ChangeLog b/ChangeLog
index 997b3c9c2..84917fb26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-20010525
+20010625
  - OpenBSD CVS Sync
    - markus@cvs.openbsd.org 2001/06/21 21:08:25
      [session.c]
@@ -43,6 +43,9 @@
      *known_hosts2 is obsolete for hostbased authentication and
      only used for backward compat. merge ssh1/2 hostkey check
      and move it to auth.c
+   - deraadt@cvs.openbsd.org 2001/06/23 02:33:05
+     [sftp.1 sftp-server.8 ssh-keygen.1]
+     join .%A entries; most by bk@rt.fm
 
 20010622
  - (stevesk) handle systems without pw_expire and pw_change.
@@ -5727,4 +5730,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1307 2001/06/25 04:30:16 mouring Exp $
+$Id: ChangeLog,v 1.1308 2001/06/25 04:32:38 mouring Exp $
diff --git a/sftp-server.8 b/sftp-server.8
index 9699cce87..f239e3682 100644
--- a/sftp-server.8
+++ b/sftp-server.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp-server.8,v 1.6 2001/04/22 13:32:26 markus Exp $
+.\" $OpenBSD: sftp-server.8,v 1.7 2001/06/23 02:33:04 deraadt Exp $
 .\"
 .\" Copyright (c) 2000 Markus Friedl.  All rights reserved.
 .\"
@@ -48,8 +48,7 @@ for more information.
 .Xr ssh 1 ,
 .Xr sshd 8
 .Rs
-.%A T. Ylonen
-.%A S. Lehtinen
+.%A T. Ylonen and S. Lehtinen
 .%T "SSH File Transfer Protocol"
 .%N draft-ietf-secsh-filexfer-00.txt
 .%D January 2001
diff --git a/sftp.1 b/sftp.1
index 756123628..66293b325 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.18 2001/05/05 13:42:51 stevesk Exp $
+.\" $OpenBSD: sftp.1,v 1.19 2001/06/23 02:33:04 deraadt Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -213,8 +213,7 @@ Damien Miller <djm@mindrot.org>
 .Xr sftp-server 8 ,
 .Xr sshd 8
 .Rs
-.%A T. Ylonen
-.%A S. Lehtinen
+.%A T. Ylonen and S. Lehtinen
 .%T "SSH File Transfer Protocol"
 .%N draft-ietf-secsh-filexfer-00.txt
 .%D January 2001
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 0f04af55b..daa9ea7b9 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-keygen.1,v 1.43 2001/06/22 21:55:49 markus Exp $
+.\"	$OpenBSD: ssh-keygen.1,v 1.44 2001/06/23 02:33:05 deraadt Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -271,8 +271,7 @@ protocol versions 1.5 and 2.0.
 .Xr ssh-agent 1 ,
 .Xr sshd 8
 .Rs
-.%A J. Galbraith
-.%A R. Thayer
+.%A J. Galbraith and R. Thayer
 .%T "SECSH Public Key File Format"
 .%N draft-ietf-secsh-publickeyfile-01.txt
 .%D March 2001