diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 3975b07aef..e4dfbee598 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* ospf_vty.c: (show_ip_ospf_neighbor_id) Should show all instances
+	  of that neighbor (since it may appear on multiple interfaces)
+	  instead of bailing out after showing the first match.
+
 2006-06-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* ospf_nsm.c: (nsm_twoway_received) When deciding whether to
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 0298af2298..ec00201757 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -3222,12 +3222,8 @@ DEFUN (show_ip_ospf_neighbor_id,
 
   for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi))
     if ((nbr = ospf_nbr_lookup_by_routerid (oi->nbrs, &router_id)))
-      {
-        show_ip_ospf_neighbor_detail_sub (vty, oi, nbr);
-        return CMD_SUCCESS;
-      }
+      show_ip_ospf_neighbor_detail_sub (vty, oi, nbr);
 
-  /* Nothing to show. */
   return CMD_SUCCESS;
 }