diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 654c31a231..610eadb133 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* ospf_interface.c: (ospf_if_set_multicast) Fix bug: was testing
+	  interface passive status improperly in light of the recent
+	  'passive-interface default' patch.  Now need to test
+	  OSPF_IF_PASSIVE_STATUS(oi) instead of
+	  OSPF_IF_PARAM(oi, passive_interface).
+
 2007-03-23 Paul Jakma <paul.jakma@sun.com>
 
 	* ospf_spf.c: (various) Add more debug statements.
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index 4b6b424dce..bf53668b95 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -717,7 +717,7 @@ ospf_if_set_multicast(struct ospf_interface *oi)
   if ((oi->state > ISM_Loopback) &&
       (oi->type != OSPF_IFTYPE_LOOPBACK) &&
       (oi->type != OSPF_IFTYPE_VIRTUALLINK) &&
-      (OSPF_IF_PARAM(oi, passive_interface) == OSPF_IF_ACTIVE))
+      (OSPF_IF_PASSIVE_STATUS(oi) == OSPF_IF_ACTIVE))
     {
       /* The interface should belong to the OSPF-all-routers group. */
       if (!OI_MEMBER_CHECK(oi, MEMBER_ALLROUTERS) &&
@@ -745,7 +745,7 @@ ospf_if_set_multicast(struct ospf_interface *oi)
   if (((oi->type == OSPF_IFTYPE_BROADCAST) ||
        (oi->type == OSPF_IFTYPE_POINTOPOINT)) &&
       ((oi->state == ISM_DR) || (oi->state == ISM_Backup)) &&
-      (OSPF_IF_PARAM(oi, passive_interface) == OSPF_IF_ACTIVE))
+      (OSPF_IF_PASSIVE_STATUS(oi) == OSPF_IF_ACTIVE))
     {
       /* The interface should belong to the OSPF-designated-routers group. */
       if (!OI_MEMBER_CHECK(oi, MEMBER_DROUTERS) &&