diff --git a/zebra/main.c b/zebra/main.c
index 1e9757b..08cc247 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -229,6 +229,9 @@
 
   assert (zvrf);
 
+#ifdef RTADV
+  rtadv_init (zvrf);
+#endif
   return 0;
 }
 
@@ -253,6 +256,10 @@
         if_down (ifp);
     }
 
+#ifdef RTADV
+  rtadv_terminate (zvrf);
+#endif
+
   list_delete_all_node (zvrf->rid_all_sorted_list);
   list_delete_all_node (zvrf->rid_lo_sorted_list);
 
@@ -394,7 +401,7 @@
   access_list_init ();
   prefix_list_init ();
 #ifdef RTADV
-  rtadv_init ();
+  rtadv_cmd_init ();
 #endif
 #ifdef HAVE_IRDP
   irdp_init();