diff --git a/ChangeLog b/ChangeLog
index b172041362..5a648f74d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-10  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-gsm-device.c
+		- (automatic_registration): accept "+CREG: 0,0"
+		- (automatic_registration_response): fail on "+CREG: 0,0"
+
 2008-04-10  Tambet Ingo  <tambet@gmail.com>
 
 	* libnm-util/nm-setting-wired.c (get_property): Fix a typo.
diff --git a/src/nm-gsm-device.c b/src/nm-gsm-device.c
index fc31103090..5a71bff2f0 100644
--- a/src/nm-gsm-device.c
+++ b/src/nm-gsm-device.c
@@ -262,6 +262,10 @@ automatic_registration_response (NMSerialDevice *device,
 		gsm_device_set_pending (NM_GSM_DEVICE (device),
 						    g_timeout_add (1000, automatic_registration_again, device));
 		break;
+	case 3:
+		nm_warning ("Automatic registration failed: not registered and not searching.");
+		nm_device_state_changed (NM_DEVICE (device), NM_DEVICE_STATE_FAILED);
+		break;
 	case -1:
 		nm_warning ("Automatic registration timed out");
 		nm_device_state_changed (NM_DEVICE (device), NM_DEVICE_STATE_FAILED);
@@ -277,7 +281,7 @@ static void
 automatic_registration (NMSerialDevice *device)
 {
 	guint id;
-	char *responses[] = { "+CREG: 0,1", "+CREG: 0,5", "+CREG: 0,2", NULL };
+	char *responses[] = { "+CREG: 0,1", "+CREG: 0,5", "+CREG: 0,2", "+CREG: 0,0", NULL };
 
 	if (!nm_serial_device_send_command_string (device, "AT+CREG?")) {
 		nm_device_state_changed (NM_DEVICE (device), NM_DEVICE_STATE_FAILED);