diff --git a/ripd/ChangeLog b/ripd/ChangeLog
index 0aa1f24..5d2c164 100644
--- a/ripd/ChangeLog
+++ b/ripd/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-01 Paul Jakma <paul.jakma@sun.com>
+
+	* rip_interface.c: Fix authentication, no-auth impossible to specify
+	  (rip_interface_new) default to RIP_NO_AUTH
+	  (rip_interface_reset) ditto
+	  (rip_interface_config_write) write out config for simple
+	  
 2005-05-29 Paul Jakma <paul@dishone.st>
 
 	* ripd.c: (rip_output_process) fix error which crept in my
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 0e267f9..4a6f78e 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -123,8 +123,7 @@
 
   /* Default authentication type is simple password for Cisco
      compatibility. */
-  /* ri->auth_type = RIP_NO_AUTH; */
-  ri->auth_type = RIP_AUTH_SIMPLE_PASSWORD;
+  ri->auth_type = RIP_NO_AUTH;
   ri->md5_auth_len = RIP_AUTH_MD5_COMPAT_SIZE;
 
   /* Set default split-horizon behavior.  If the interface is Frame
@@ -632,8 +631,7 @@
       ri->ri_send = RI_RIP_UNSPEC;
       ri->ri_receive = RI_RIP_UNSPEC;
 
-      /* ri->auth_type = RIP_NO_AUTH; */
-      ri->auth_type = RIP_AUTH_SIMPLE_PASSWORD;
+      ri->auth_type = RIP_NO_AUTH;
 
       if (ri->auth_str)
 	{
@@ -1714,8 +1712,7 @@
   ifp = (struct interface *)vty->index;
   ri = ifp->info;
 
-  /* ri->auth_type = RIP_NO_AUTH; */
-  ri->auth_type = RIP_AUTH_SIMPLE_PASSWORD;
+  ri->auth_type = RIP_NO_AUTH;
   ri->md5_auth_len = RIP_AUTH_MD5_COMPAT_SIZE;
 
   return CMD_SUCCESS;
@@ -2052,11 +2049,8 @@
 		 VTY_NEWLINE);
 
       /* RIP authentication. */
-#if 0 
-      /* RIP_AUTH_SIMPLE_PASSWORD becomes default mode. */
       if (ri->auth_type == RIP_AUTH_SIMPLE_PASSWORD)
 	vty_out (vty, " ip rip authentication mode text%s", VTY_NEWLINE);
-#endif /* 0 */
 
       if (ri->auth_type == RIP_AUTH_MD5)
         {