diff --git a/ChangeLog b/ChangeLog
index 109986a9d5..61b9709b40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-21  Dan Williams  <dcbw@redhat.com>
+
+	* src/NetworkManagerPolicy.c
+		- (device_state_changed): update routing and DNS when a device goes
+			into unmanaged or unavailable states too (like rfkill or carrier loss)
+
 2008-04-21  Dan Williams  <dcbw@redhat.com>
 
 	* include/NetworkManager.h
diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c
index 458eab71ab..4494bd8f0a 100644
--- a/src/NetworkManagerPolicy.c
+++ b/src/NetworkManagerPolicy.c
@@ -321,6 +321,8 @@ device_state_changed (NMDevice *device, NMDeviceState state, gpointer user_data)
 
 		update_routing_and_dns (policy, FALSE);
 		break;
+	case NM_DEVICE_STATE_UNMANAGED:
+	case NM_DEVICE_STATE_UNAVAILABLE:
 	case NM_DEVICE_STATE_DISCONNECTED:
 		update_routing_and_dns (policy, FALSE);
 		schedule_activate_check (policy, device);