diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 3ce7b9e..3457c78 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-08 Michael Larson <mike@vyatta.com>
+
+	* zebra_rib.c: (nexthop_active_check) Replace if_is_up with
+	  if_is_operative to solve problems with static interface
+	  routes not behaving properly with link-detect.
+
 2007-11-12 Denis Ovsienko
 
 	* connected.c: (connected_up_ipv4, connected_down_ipv4,
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 37b84a6..e27c63b 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -795,7 +795,7 @@
     {
     case NEXTHOP_TYPE_IFINDEX:
       ifp = if_lookup_by_index (nexthop->ifindex);
-      if (ifp && if_is_up (ifp))
+      if (ifp && if_is_operative(ifp))
 	SET_FLAG (nexthop->flags, NEXTHOP_FLAG_ACTIVE);
       else
 	UNSET_FLAG (nexthop->flags, NEXTHOP_FLAG_ACTIVE);
@@ -804,7 +804,7 @@
       family = AFI_IP6;
     case NEXTHOP_TYPE_IFNAME:
       ifp = if_lookup_by_name (nexthop->ifname);
-      if (ifp && if_is_up (ifp))
+      if (ifp && if_is_operative(ifp))
 	{
 	  if (set)
 	    nexthop->ifindex = ifp->ifindex;
@@ -838,7 +838,7 @@
       if (IN6_IS_ADDR_LINKLOCAL (&nexthop->gate.ipv6))
 	{
 	  ifp = if_lookup_by_index (nexthop->ifindex);
-	  if (ifp && if_is_up (ifp))
+	  if (ifp && if_is_operative(ifp))
 	    SET_FLAG (nexthop->flags, NEXTHOP_FLAG_ACTIVE);
 	  else
 	    UNSET_FLAG (nexthop->flags, NEXTHOP_FLAG_ACTIVE);