diff --git a/ChangeLog b/ChangeLog
index 40168ceec..ecfcf35ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,10 @@
      [readconf.c ssh.1]
      change RhostsRSAAuthentication and RhostsAuthentication default to no
      since ssh is no longer setuid root by default; ok markus@
+   - stevesk@cvs.openbsd.org 2002/06/10 21:21:10
+     [ssh_config]
+     update defaults for RhostsRSAAuthentication and RhostsAuthentication
+     here too (all options commented out with default value).
 
 20020609
  - (bal) OpenBSD CVS Sync
@@ -886,4 +890,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2205 2002/06/11 15:53:05 mouring Exp $
+$Id: ChangeLog,v 1.2206 2002/06/11 15:55:01 mouring Exp $
diff --git a/ssh_config b/ssh_config
index 2a484d90c..672462657 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
-#	$OpenBSD: ssh_config,v 1.13 2002/06/08 05:41:18 markus Exp $
+#	$OpenBSD: ssh_config,v 1.14 2002/06/10 21:21:10 stevesk Exp $
 
 # This is the ssh client system-wide configuration file.  See ssh(1)
 # for more information.  This file provides defaults for users, and
@@ -18,8 +18,8 @@
 # Host *
 #   ForwardAgent no
 #   ForwardX11 no
-#   RhostsAuthentication yes
-#   RhostsRSAAuthentication yes
+#   RhostsAuthentication no
+#   RhostsRSAAuthentication no
 #   RSAAuthentication yes
 #   PasswordAuthentication yes
 #   BatchMode no