diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 3df7891..07bf8ba 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-15 Paul Jakma <paul.jakma@sun.com>
+
+	* zserv.c: (general) Remove the private zebra_command_str
+	  in favour of newly added libzebra zserv_command_string.
+
 2006-05-11 Paul Jakma <paul.jakma@sun.com>
 
 	* interface.c: (if_delete_update) route_node_lookup may return
diff --git a/zebra/zserv.c b/zebra/zserv.c
index aa88ab5..5b38fc1 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -52,34 +52,6 @@
 
 extern struct zebra_privs_t zserv_privs;
 
-/* For logging of zebra meesages. */
-static const char *zebra_command_str [] =
-{
-  "NULL",
-  "ZEBRA_INTERFACE_ADD",
-  "ZEBRA_INTERFACE_DELETE",
-  "ZEBRA_INTERFACE_ADDRESS_ADD",
-  "ZEBRA_INTERFACE_ADDRESS_DELETE",
-  "ZEBRA_INTERFACE_UP",
-  "ZEBRA_INTERFACE_DOWN",
-  "ZEBRA_IPV4_ROUTE_ADD",
-  "ZEBRA_IPV4_ROUTE_DELETE",
-  "ZEBRA_IPV6_ROUTE_ADD",
-  "ZEBRA_IPV6_ROUTE_DELETE",
-  "ZEBRA_REDISTRIBUTE_ADD",
-  "ZEBRA_REDISTRIBUTE_DELETE",
-  "ZEBRA_REDISTRIBUTE_DEFAULT_ADD",
-  "ZEBRA_REDISTRIBUTE_DEFAULT_DELETE",
-  "ZEBRA_IPV4_NEXTHOP_LOOKUP",
-  "ZEBRA_IPV6_NEXTHOP_LOOKUP",
-  "ZEBRA_IPV4_IMPORT_LOOKUP",
-  "ZEBRA_IPV6_IMPORT_LOOKUP",
-  "ZEBRA_ROUTER_ID_ADD",
-  "ZEBRA_ROUTER_ID_DELETE",
-  "ZEBRA_ROUTER_ID_UPDATE"
-};
-
-
 static void zebra_client_close (struct zserv *client);
 
 static int
@@ -1256,7 +1228,7 @@
 
   if (IS_ZEBRA_DEBUG_PACKET && IS_ZEBRA_DEBUG_RECV)
     zlog_debug ("zebra message received [%s] %d", 
-	       zebra_command_str[command], length);
+	       zserv_command_string (command), length);
 
   switch (command) 
     {