diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index fad80a1..081cffe 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-13 Hasso Tepper <hasso at quagga.net>
+
+	* zebra_snmp.c: Remove defaults used to initialize smux connection to
+	  snmpd. Connection is initialized only if smux peer is configured.
+
 2004-10-12 Hasso Tepper <hasso at quagga.net>
 
 	* zebra_vty.c: Unbreak "show ip route" command help and make it work
diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c
index dece89e..4536026 100644
--- a/zebra/zebra_snmp.c
+++ b/zebra/zebra_snmp.c
@@ -40,7 +40,6 @@
 #include "zebra/zserv.h"
 
 #define IPFWMIB 1,3,6,1,2,1,4,24
-#define ZEBRAOID 1,3,6,1,4,1,3317,1,2,1
 
 /* ipForwardTable */
 #define IPFORWARDDEST                         1
@@ -87,7 +86,6 @@
 extern struct zebra_t zebrad;
 
 oid ipfw_oid [] = { IPFWMIB };
-oid zebra_oid [] = { ZEBRAOID };
 
 /* Hook functions. */
 u_char * ipFwNumber ();
@@ -564,8 +562,7 @@
 void
 zebra_snmp_init ()
 {
-  smux_init (zebrad.master, zebra_oid, sizeof (zebra_oid) / sizeof (oid));
+  smux_init (zebrad.master);
   REGISTER_MIB("mibII/ipforward", zebra_variables, variable, ipfw_oid);
-  smux_start ();
 }
 #endif /* HAVE_SNMP */