diff --git a/bgpd/bgp_btoa.c b/bgpd/bgp_btoa.c
index 284b280..b408efd 100644
--- a/bgpd/bgp_btoa.c
+++ b/bgpd/bgp_btoa.c
@@ -144,7 +144,7 @@
   size_t len;
   int source_as;
   int dest_as;
-  int ifindex;
+  ifindex_t ifindex;
   int family;
   struct in_addr sip;
   struct in_addr dip;
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index 7a22713..51a6f60 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -365,7 +365,7 @@
 int
 bgp_connect (struct peer *peer)
 {
-  unsigned int ifindex = 0;
+  ifindex_t ifindex = 0;
 
   /* Make socket for the peer. */
   peer->fd = sockunion_socket (&peer->su);
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index af312e3..4ec15d0 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -757,7 +757,7 @@
   /* We have to think about a IPv6 link-local address curse. */
   if (p->family == AF_INET6)
     {
-      unsigned int ifindex;
+      ifindex_t ifindex;
       struct in6_addr *nexthop;
       struct zapi_ipv6 api;
 
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 455034f..5be5a19 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -340,7 +340,7 @@
   time_t readtime;		/* Last read time */
   time_t resettime;		/* Last reset time */
   
-  unsigned int ifindex;		/* ifindex of the BGP connection. */
+  ifindex_t ifindex;		/* ifindex of the BGP connection. */
   char *ifname;			/* bind interface name. */
   char *update_if;
   union sockunion *update_source;