diff --git a/ChangeLog b/ChangeLog
index 3db28e5af..f474805ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-04  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Bill Nottingham <notting@redhat.com>
+	* src/NetworkManagerDevice.c
+		- (nm_device_activation_cancel): reset the quit_activation flag
+
 2005-09-04  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-activation-request.c
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index c4142c47d..26e02dda2 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -3159,6 +3159,7 @@ void nm_device_activation_cancel (NMDevice *dev)
 		nm_wait_for_completion (NM_COMPLETION_TRIES_INFINITY, G_USEC_PER_SEC / 20, nm_ac_test, NULL, args);
 		nm_info ("Activation (%s): cancelled.", nm_device_get_iface(dev));
 		nm_schedule_state_change_signal_broadcast (dev->app_data);
+		dev->quit_activation = FALSE;
 	}
 }