diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index e8eae90..d84d54b 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,5 +1,10 @@
 2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
+	* ospf_zebra.c: (zebra_interface_if_lookup) Must use
+	  if_lookup_by_name_len.
+
+2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
 	* ospf_interface.c: (ospf_vl_new) Use strnlen to fix call to if_create.
 
 2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 74936df..27299c5 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -148,13 +148,14 @@
 static struct interface *
 zebra_interface_if_lookup (struct stream *s)
 {
-  u_char ifname_tmp[INTERFACE_NAMSIZ];
+  char ifname_tmp[INTERFACE_NAMSIZ];
 
   /* Read interface name. */
   stream_get (ifname_tmp, s, INTERFACE_NAMSIZ);
 
   /* And look it up. */
-  return if_lookup_by_name ((char *) ifname_tmp);
+  return if_lookup_by_name_len(ifname_tmp,
+			       strnlen(ifname_tmp, INTERFACE_NAMSIZ));
 }
 
 int