diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 75a59cb..1da5d1d 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -9090,7 +9090,7 @@
         safi = SAFI_UNICAST;
       else if (strncmp (safi_str, "vpnv4", 5) == 0)
         safi = BGP_SAFI_VPNV4;
-      else if (strncmp (safi_str, "vpnv6", 6) == 0)
+      else if (strncmp (safi_str, "vpnv6", 5) == 0)
         safi = BGP_SAFI_VPNV6;
       else
         {
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index a5afaed..73a9ea1 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -726,7 +726,7 @@
 
 /* SAFI which used in open capability negotiation.  */
 #define BGP_SAFI_VPNV4                         128
-#define BGP_SAFI_VPNV6                         129
+#define BGP_SAFI_VPNV6                         128
 
 /* Max TTL value.  */
 #define TTL_MAX                                255