diff --git a/ChangeLog b/ChangeLog
index 00206b7fb5..02cdbba4d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+2005-11-08  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Bill Moss <bmoss@clemson.edu>
+	* src/NetworkManagerDevice.c
+		- (nm_device_activate_stage5_ip_config_commit): fix ordering
+			of nm_policy_schedule_activation_finish() to prevent a
+			race condition that causes the link to be dropped
+
 2005-11-08  Dan Williams  <dcbw@redhat.com>
 
 	Patch from Bill Moss <bmoss@clemson.edu>
 	* src/NetworkManagerAPList.c
 	  src/NetworkManagerDevice.c
-	  src/NetworkManagerDBus.c
+	  src/NetworkManagerDbus.c
 		- Replace occurances of ether_ntoa_r() with iw_ether_ntop() so
 			we get more readable ether/mac addresses
 
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index aa44df3635..f8c1ace0cd 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -3154,8 +3154,8 @@ static gboolean nm_device_activate_stage5_ip_config_commit (NMActRequest *req)
 		nm_device_update_ip4_address (dev);
 		nm_system_device_add_ip6_link_address (dev);
 		nm_system_restart_mdns_responder ();
-		nm_policy_schedule_activation_finish (req);
 		nm_device_set_link_active (dev, nm_device_probe_link_state (dev));
+		nm_policy_schedule_activation_finish (req);
 	}
 	else
 		nm_policy_schedule_activation_failed (req);