diff --git a/ChangeLog b/ChangeLog
index b9a3ca2fb..54fa577b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,11 @@
      [ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh.c sshconnect.c]
      [sshconnect1.c sshd.c xmalloc.c]
      move #include <stdlib.h> out of includes.h
+   - jmc@cvs.openbsd.org 2006/07/27 08:00:50
+     [ssh_config.5]
+     avoid confusing wording in HashKnownHosts:
+     originally spotted by alan amesbury;
+     ok deraadt
 
 20060804
  - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@@ -5095,4 +5100,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4446 2006/08/05 01:34:19 djm Exp $
+$Id: ChangeLog,v 1.4447 2006/08/05 01:34:51 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 55ca55303..20c58934a 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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: ssh_config.5,v 1.96 2006/07/11 18:50:48 markus Exp $
+.\" $OpenBSD: ssh_config.5,v 1.97 2006/07/27 08:00:50 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -497,8 +497,9 @@ but they do not reveal identifying information should the file's contents
 be disclosed.
 The default is
 .Dq no .
-Note that hashing of names and addresses will not be retrospectively applied
-to existing known hosts files, but these may be manually hashed using
+Note that existing names and addresses in known hosts files
+will not be converted automatically,
+but may be manually hashed using
 .Xr ssh-keygen 1 .
 .It Cm HostbasedAuthentication
 Specifies whether to try rhosts based authentication with public key