diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 93feb05..1d16228 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-13 Hasso Tepper <hasso at quagga.net>
+
+	* bgp_snmp.c: Remove defaults used to initialize smux connection to
+	  snmpd. Connection is initialized only if smux peer is configured.
+
 2004-10-13 Paul Jakma <paul@dishone.st>
 
 	* (global) more const'ification and fixups of types to clean up code.
diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
index e5bcd03..6ffadf9 100644
--- a/bgpd/bgp_snmp.c
+++ b/bgpd/bgp_snmp.c
@@ -49,10 +49,6 @@
 #define BGPESTABLISHED			1
 #define BGPBACKWARDTRANSITION		2	
 
-/* Zebra enterprise BGP MIB.  This variable is used for register
-   OSPF MIB to SNMP agent under SMUX protocol.  */
-#define BGPDMIB 1,3,6,1,4,1,3317,1,2,2
-
 /* BGP MIB bgpVersion. */
 #define BGPVERSION			      0
 
@@ -125,7 +121,6 @@
 
 /* BGP-MIB instances. */
 oid bgp_oid [] = { BGP4MIB };
-oid bgpd_oid [] = { BGPDMIB };
 
 /* IP address 0.0.0.0. */
 static struct in_addr bgp_empty_addr = {0};
@@ -880,8 +875,7 @@
   if ( !(bm = bgp_get_master ()) )
     return;
     
-  smux_init (bm->master, bgpd_oid, sizeof bgpd_oid / sizeof (oid));
+  smux_init (bm->master);
   REGISTER_MIB("mibII/bgp", bgp_variables, variable, bgp_oid);
-  smux_start ();
 }
 #endif /* HAVE_SNMP */