diff --git a/ChangeLog b/ChangeLog
index 7e0c6722a..134a37162 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,9 @@
    - jmc@cvs.openbsd.org 2010/09/03 11:09:29
      [scp.1]
      add an EXIT STATUS section for /usr/bin;
+   - jmc@cvs.openbsd.org 2010/09/04 09:38:34
+     [ssh-add.1 ssh.1]
+     two more EXIT STATUS sections;
 
 20100831
  - OpenBSD CVS Sync
diff --git a/ssh-add.1 b/ssh-add.1
index 3699db5eb..1862eed8d 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-add.1,v 1.53 2010/08/31 11:54:45 djm Exp $
+.\"	$OpenBSD: ssh-add.1,v 1.54 2010/09/04 09:38:34 jmc Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -37,7 +37,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.
 .\"
-.Dd $Mdocdate: August 31 2010 $
+.Dd $Mdocdate: September 4 2010 $
 .Dt SSH-ADD 1
 .Os
 .Sh NAME
@@ -176,7 +176,7 @@ Identity files should not be readable by anyone but the user.
 Note that
 .Nm
 ignores identity files if they are accessible by others.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 Exit status is 0 on success, 1 if the specified command fails,
 and 2 if
 .Nm
diff --git a/ssh.1 b/ssh.1
index be4a334f3..95ee85689 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
 .\" (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: ssh.1,v 1.311 2010/08/31 21:14:58 jmc Exp $
-.Dd $Mdocdate: August 31 2010 $
+.\" $OpenBSD: ssh.1,v 1.312 2010/09/04 09:38:34 jmc Exp $
+.Dd $Mdocdate: September 4 2010 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -647,10 +647,6 @@ may additionally obtain configuration data from
 a per-user configuration file and a system-wide configuration file.
 The file format and configuration options are described in
 .Xr ssh_config 5 .
-.Pp
-.Nm
-exits with the exit status of the remote command or with 255
-if an error occurred.
 .Sh AUTHENTICATION
 The OpenSSH SSH client supports SSH protocols 1 and 2.
 The default is to use protocol 2 only,
@@ -1394,6 +1390,10 @@ See the
 .Xr sshd 8
 manual page for more information.
 .El
+.Sh EXIT STATUS
+.Nm
+exits with the exit status of the remote command or with 255
+if an error occurred.
 .Sh SEE ALSO
 .Xr scp 1 ,
 .Xr sftp 1 ,