2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 48d2e97b8..5ab835b57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,12 @@
      one of its underlying hash algorithms is found to be vulnerable to a
      new attack.  http://www.ietf.org/rfc/rfc4418.txt
      in conjunction with and OK djm@
+   - pvalchev@cvs.openbsd.org 2007/06/08 04:40:40
+     [ssh_config]
+     Add a "MACs" line after "Ciphers" with the default MAC algorithms,
+     to ease people who want to tweak both (eg. for performance reasons).
+     ok deraadt@ djm@ dtucker@
+
 20070605
  - (dtucker) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2007/05/22 10:18:52
@@ -2985,4 +2991,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4681 2007/06/11 04:01:42 djm Exp $
+$Id: ChangeLog,v 1.4682 2007/06/11 04:04:42 djm Exp $
diff --git a/ssh_config b/ssh_config
index 177521caa..8cb0698a8 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $
+#       $OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -38,6 +38,7 @@
 #   Protocol 2,1
 #   Cipher 3des
 #   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
+#   MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
 #   EscapeChar ~
 #   Tunnel no
 #   TunnelDevice any:any