diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index 17da81d..5e16c70 100644
--- a/ospf6d/ChangeLog
+++ b/ospf6d/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-12 Hasso Tepper <hasso at quagga.net>
+
+	* ospf6_snmp.c: Remove defaults used to initialize smux connection to
+	  snmpd. Connection is initialized only if smux peer is configured.
+
 2004-10-11 Hasso Tepper <hasso at quagga.net>
 
 	* osp6_top.c, ospf6_top.h: Better handling for router-id. If we use
diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c
index 98a7f5a..edc8bc4 100644
--- a/ospf6d/ospf6_snmp.c
+++ b/ospf6d/ospf6_snmp.c
@@ -50,9 +50,6 @@
 /* OSPFv3-MIB */
 #define OSPFv3MIB 1,3,6,1,3,102
 
-/* Zebra enterprise ospf6d MIB */
-#define OSPF6DOID 1,3,6,1,4,1,3317,1,2,6
-
 /* OSPFv3 MIB General Group values. */
 #define OSPFv3ROUTERID                   1
 #define OSPFv3ADMINSTAT                  2
@@ -101,7 +98,6 @@
 
 /* OSPFv3-MIB instances. */
 oid ospfv3_oid [] = { OSPFv3MIB };
-oid ospf6d_oid [] = { OSPF6DOID };
 
 /* empty ID 0.0.0.0 e.g. empty router-id */
 static struct in_addr ospf6_empty_id = {0};
@@ -295,9 +291,8 @@
 void
 ospf6_snmp_init (struct thread_master *master)
 {
-  smux_init (master, ospf6d_oid, sizeof (ospf6d_oid) / sizeof (oid));
+  smux_init (master);
   REGISTER_MIB ("OSPFv3MIB", ospfv3_variables, variable, ospfv3_oid);
-  smux_start ();
 }
 
 #endif /* HAVE_SNMP */