diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index d107fa6..4c18fc3 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* bgp_zebra.c: (bgp_interface_delete) After deleting, set ifp->ifindex
+	  to IFINDEX_INTERNAL.
+
 2005-03-21 Hasso Tepper <hasso at quagga.net>
 
 	* bgp_route.c: Don't crash while clearing route tables if there is
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index f54608a..176e447 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -81,6 +81,7 @@
 
   s = zclient->ibuf;
   ifp = zebra_interface_state_read (s);
+  ifp->ifindex = IFINDEX_INTERNAL;
 
   return 0;
 }