diff --git a/ChangeLog b/ChangeLog
index fcf4ec3f9..b07c7620b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
    - deraadt@cvs.openbsd.org 2001/03/06 15:10:42
      [sftp.1]
      order things
+   - deraadt@cvs.openbsd.org 2001/03/07 01:19:06
+     [ssh.1 sshd.8]
+     the name "secure shell" is boring, noone ever uses it
 
 20010306
  - (bal) OpenBSD CVS Sync
@@ -4423,4 +4426,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.921 2001/03/07 01:29:17 mouring Exp $
+$Id: ChangeLog,v 1.922 2001/03/07 06:07:22 mouring Exp $
diff --git a/ssh.1 b/ssh.1
index c45b09939..51efc63f5 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,13 +34,13 @@
 .\" (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.95 2001/03/05 17:40:48 stevesk Exp $
+.\" $OpenBSD: ssh.1,v 1.96 2001/03/07 01:19:06 deraadt Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
 .Sh NAME
 .Nm ssh
-.Nd OpenSSH secure shell client (remote login program)
+.Nd OpenSSH SSH client (remote login program)
 .Sh SYNOPSIS
 .Nm ssh
 .Op Fl l Ar login_name
@@ -76,7 +76,7 @@
 .Op Ar command
 .Sh DESCRIPTION
 .Nm
-(Secure Shell) is a program for logging into a remote machine and for
+(SSH client) is a program for logging into a remote machine and for
 executing commands on a remote machine.
 It is intended to replace
 rlogin and rsh, and provide secure encrypted communications between
diff --git a/sshd.8 b/sshd.8
index 30e51b76a..da81de11d 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,13 +34,13 @@
 .\" (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.105 2001/03/05 16:07:15 deraadt Exp $
+.\" $OpenBSD: sshd.8,v 1.106 2001/03/07 01:19:06 deraadt Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
 .Sh NAME
 .Nm sshd
-.Nd OpenSSH secure shell daemon
+.Nd OpenSSH ssh daemon
 .Sh SYNOPSIS
 .Nm sshd
 .Op Fl diqD46
@@ -54,7 +54,7 @@
 .Op Fl V Ar client_protocol_id
 .Sh DESCRIPTION
 .Nm
-(Secure Shell Daemon) is the daemon program for
+(SSH Daemon) is the daemon program for
 .Xr ssh 1 .
 Together these programs replace rlogin and rsh, and
 provide secure encrypted communications between two untrusted hosts