Index: sys/netinet6/in6_fib.h
===================================================================
--- sys/netinet6/in6_fib.h
+++ sys/netinet6/in6_fib.h
@@ -41,14 +41,15 @@
 	struct in6_addr	nh_addr;	/* GW/DST IPv4 address */
 };
 
-/* Does not differ from nhop6_basic */
+/* Extended nexthop info used for control protocols. */
 struct nhop6_extended {
 	struct ifnet	*nh_ifp;	/* Logical egress interface */
+	struct in6_ifaddr *nh_ia;	/* Associated address. */
 	uint16_t	nh_mtu;		/* nexthop mtu */
 	uint16_t	nh_flags;	/* nhop flags */
 	uint8_t		spare[4];
 	struct in6_addr	nh_addr;	/* GW/DST IPv6 address */
-	uint64_t	spare2[2];
+	uint64_t	spare2[1];
 };
 
 int fib6_lookup_nh_basic(uint32_t fibnum, const struct in6_addr *dst,
Index: sys/netinet6/in6_fib.c
===================================================================
--- sys/netinet6/in6_fib.c
+++ sys/netinet6/in6_fib.c
@@ -75,6 +75,8 @@
 static struct ifnet *fib6_get_ifaifp(struct rtentry *rte);
 #define RNTORT(p)	((struct rtentry *)(p))
 
+#define	ifatoia6(ifa)	((struct in6_ifaddr *)(ifa))
+
 CHK_STRUCT_ROUTE_COMPAT(struct route_in6, ro_dst);
 
 /*
@@ -117,7 +119,6 @@
 	if (rte->rt_flags & RTF_GATEWAY) {
 		gw = (struct sockaddr_in6 *)rte->rt_gateway;
 		pnh6->nh_addr = gw->sin6_addr;
-		in6_clearscope(&pnh6->nh_addr);
 	} else
 		pnh6->nh_addr = *dst;
 	/* Set flags */
@@ -145,7 +146,6 @@
 	if (rte->rt_flags & RTF_GATEWAY) {
 		gw = (struct sockaddr_in6 *)rte->rt_gateway;
 		pnh6->nh_addr = gw->sin6_addr;
-		in6_clearscope(&pnh6->nh_addr);
 	} else
 		pnh6->nh_addr = *dst;
 	/* Set flags */
@@ -153,6 +153,7 @@
 	gw = (struct sockaddr_in6 *)rt_key(rte);
 	if (IN6_IS_ADDR_UNSPECIFIED(&gw->sin6_addr))
 		pnh6->nh_flags |= NHF_DEFAULT;
+	pnh6->nh_ia = ifatoia6(rte->rt_ifa);
 }
 
 /*