diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index f045c1d..3975b07 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* ospf_nsm.c: (nsm_twoway_received) When deciding whether to
+	  change from state Init to ExStart, the test for whether the
+	  neighboring router is DR or BDR should be against the
+	  local router's notion of DR/BDR, not the neighbor's view.
+
 2006-06-28 Erik Muller <erikm@internap.com>
 
 	* ospfd.h: Define 2 new struct ospf config flags:
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index 878ab56..df9a525 100644
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -203,8 +203,8 @@
     next_state = NSM_ExStart;
 
   /* Neighboring Router is the DRouter or the BDRouter. */
-  if (IPV4_ADDR_SAME (&nbr->address.u.prefix4, &nbr->d_router) ||
-      IPV4_ADDR_SAME (&nbr->address.u.prefix4, &nbr->bd_router))
+  if (IPV4_ADDR_SAME (&nbr->address.u.prefix4, &DR(oi)) ||
+      IPV4_ADDR_SAME (&nbr->address.u.prefix4, &BDR(oi)))
     next_state = NSM_ExStart;
 
   return next_state;