diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index baf76fb..20feba0 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -753,6 +753,7 @@
       api.flags = flags;
       api.type = ZEBRA_ROUTE_BGP;
       api.message = 0;
+      api.safi = safi;
       SET_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP);
       api.nexthop_num = 1;
       api.nexthop = &nexthop;
@@ -869,6 +870,7 @@
       api.flags = flags;
       api.type = ZEBRA_ROUTE_BGP;
       api.message = 0;
+      api.safi = safi;
       SET_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP);
       api.nexthop_num = 1;
       api.nexthop = &nexthop;
diff --git a/lib/zclient.c b/lib/zclient.c
index 0c3461e..3521d99 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -538,6 +538,7 @@
   stream_putc (s, api->type);
   stream_putc (s, api->flags);
   stream_putc (s, api->message);
+  stream_putw (s, api->safi);
   
   /* Put prefix information. */
   psize = PSIZE (p->prefixlen);
diff --git a/lib/zclient.h b/lib/zclient.h
index 8b3e71a..73389ec 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -167,6 +167,8 @@
 
   u_char message;
 
+  safi_t safi;
+
   u_char nexthop_num;
   struct in6_addr **nexthop;