diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 1109eb0..7720adc 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-24 Kenji Yabuuchi
+
+	* ospf_interface.c(ospf_if_lookup_recv_if): Use the most specific
+	  match for interface lookup.
+
 2003-05-18 Hasso Tepper <hasso@estpak.ee>
 
 	* ospf_vty.c: Show NSSA LSA route info in "show ip ospf database"
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index c37e194..569e478 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -425,7 +425,11 @@
       else
 	{
 	  if (prefix_match (oi->address, (struct prefix *) &addr))
-	    match = oi;
+	    {
+	      if (match == NULL || 
+	         (match->address->prefixlen < oi->address->prefixlen)
+	        match = oi;
+	    }
 	}
     }