diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 777801c..f3b6a8c 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-13 Paul Jakma <paul.jakma@sun.com>
+
+	* (various) Remove 0 entries from struct message's, unneeded due to
+	  recent improvements in mes_lookup/LOOKUP.
+
 2008-01-29 Jorge Boncompte <jorge@dti2.net>
 
 	* bgp_network.c: (bgp_socket) IPv4-only version crashes if -l is not
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index dd3cc96..26f62f5 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -60,7 +60,6 @@
   { BGP_ATTR_AS4_PATH,         "AS4_PATH" }, 
   { BGP_ATTR_AS4_AGGREGATOR,   "AS4_AGGREGATOR" }, 
   { BGP_ATTR_AS_PATHLIMIT,     "AS_PATHLIMIT" },
-  { 0, NULL }
 };
 int attr_str_max = sizeof(attr_str)/sizeof(attr_str[0]);
 
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index acb1de7..757b9cf 100644
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -59,7 +59,6 @@
 /* messages for BGP-4 status */
 struct message bgp_status_msg[] = 
 {
-  { 0, "null" },
   { Idle, "Idle" },
   { Connect, "Connect" },
   { Active, "Active" },
@@ -86,7 +85,6 @@
 /* message for BGP-4 Notify */
 struct message bgp_notify_msg[] = 
 {
-  { 0, "" },
   { BGP_NOTIFY_HEADER_ERR, "Message Header Error"},
   { BGP_NOTIFY_OPEN_ERR, "OPEN Message Error"},
   { BGP_NOTIFY_UPDATE_ERR, "UPDATE Message Error"},
@@ -99,7 +97,6 @@
 
 struct message bgp_notify_head_msg[] = 
 {
-  { 0, "null"},
   { BGP_NOTIFY_HEADER_NOT_SYNC, "/Connection Not Synchronized"},
   { BGP_NOTIFY_HEADER_BAD_MESLEN, "/Bad Message Length"},
   { BGP_NOTIFY_HEADER_BAD_MESTYPE, "/Bad Message Type"}
@@ -108,7 +105,6 @@
 
 struct message bgp_notify_open_msg[] = 
 {
-  { 0, "null" },
   { BGP_NOTIFY_OPEN_UNSUP_VERSION, "/Unsupported Version Number" },
   { BGP_NOTIFY_OPEN_BAD_PEER_AS, "/Bad Peer AS"},
   { BGP_NOTIFY_OPEN_BAD_BGP_IDENT, "/Bad BGP Identifier"},
@@ -121,7 +117,6 @@
 
 struct message bgp_notify_update_msg[] = 
 {
-  { 0, "null"}, 
   { BGP_NOTIFY_UPDATE_MAL_ATTR, "/Malformed Attribute List"},
   { BGP_NOTIFY_UPDATE_UNREC_ATTR, "/Unrecognized Well-known Attribute"},
   { BGP_NOTIFY_UPDATE_MISS_ATTR, "/Missing Well-known Attribute"},
@@ -138,7 +133,6 @@
 
 struct message bgp_notify_cease_msg[] =
 {
-  { 0, ""},
   { BGP_NOTIFY_CEASE_MAX_PREFIX, "/Maximum Number of Prefixes Reached"},
   { BGP_NOTIFY_CEASE_ADMIN_SHUTDOWN, "/Administratively Shutdown"},
   { BGP_NOTIFY_CEASE_PEER_UNCONFIG, "/Peer Unconfigured"},
@@ -152,7 +146,6 @@
 
 struct message bgp_notify_capability_msg[] = 
 {
-  { 0, "null" },
   { BGP_NOTIFY_CAPABILITY_INVALID_ACTION, "/Invalid Action Value" },
   { BGP_NOTIFY_CAPABILITY_INVALID_LENGTH, "/Invalid Capability Length"},
   { BGP_NOTIFY_CAPABILITY_MALFORMED_CODE, "/Malformed Capability Value"},
diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 1b13a45..84d8191 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -443,7 +443,6 @@
 
 static struct message capcode_str[] =
 {
-  { 0,	""},
   { CAPABILITY_CODE_MP,			"MultiProtocol Extensions"	},
   { CAPABILITY_CODE_REFRESH,		"Route Refresh"			},
   { CAPABILITY_CODE_ORF,		"Cooperative Route Filtering" 	},