diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 21a4a56b08..437d51cd8c 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-12 Paul Jakma <paul.jakma@sun.com>
+
+	* bgp_attr.c: (bgp_packet_attribute) Remove dead code, Coverity
+	  CID #1
+
 2006-05-08 Paul Jakma <paul.jakma@sun.com>
 
 	* bgp_community.c: (community_str2com) Coverity CID#62, fix
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index e9dde0fdb1..4c72d80ab7 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -1505,13 +1505,8 @@ bgp_packet_attribute (struct bgp *bgp, struct peer *peer,
 
       if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_ORIGINATOR_ID))
 	stream_put_in_addr (s, &attr->originator_id);
-      else
-	{
-	  if (from)
-	    stream_put_in_addr (s, &from->remote_id);
-	  else
-	    stream_put_in_addr (s, &attr->originator_id);
-	}
+      else 
+        stream_put_in_addr (s, &from->remote_id);
 
       /* Cluster list. */
       stream_putc (s, BGP_ATTR_FLAG_OPTIONAL);