Index: sys/netinet/in.c
===================================================================
--- sys/netinet/in.c
+++ sys/netinet/in.c
@@ -167,11 +167,14 @@
 {
 	struct rm_priotracker in_ifa_tracker;
 	in_addr_t in = IA_SIN(ia)->sin_addr.s_addr;
+	uint32_t fib = ia->ia_ifa.ifa_ifp->if_fib;
 	struct in_ifaddr *it;
 
 	IN_IFADDR_RLOCK(&in_ifa_tracker);
 	LIST_FOREACH(it, INADDR_HASH(in), ia_hash) {
-		if (it != ia && IA_SIN(it)->sin_addr.s_addr == in) {
+		in_addr_t it_addr = IA_SIN(it)->sin_addr.s_addr;
+		uint32_t it_fib = it->ia_ifa.ifa_ifp->if_fib;
+		if (it != ia && it_addr == in && it_fib == fib) {
 			ifa_ref(&it->ia_ifa);
 			IN_IFADDR_RUNLOCK(&in_ifa_tracker);
 			return (it);
@@ -1007,11 +1010,6 @@
 	if (ia_need_loopback_route(target) && (flags & LLE_STATIC)) {
 		struct in_ifaddr *eia;
 
-		/*
-		 * XXXME: add fib-aware in_localip.
-		 * We definitely don't want to switch between
-		 * prefixes in different fibs.
-		 */
 		eia = in_localip_more(target);
 
 		if (eia != NULL) {