diff --git a/ChangeLog b/ChangeLog
index d8e58548ef..55415f55ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-22  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-gsm-device.c
+		- (schedule_automatic_registration_again): use a short timeout here
+			instead of an idle handler to avoid using too much CPU polling for
+			something we should be waiting a bit for anyway
+
 2008-10-22  Dan Williams  <dcbw@redhat.com>
 
 	* include/NetworkManager.h
diff --git a/src/nm-gsm-device.c b/src/nm-gsm-device.c
index da71c5106d..dc44cbfc45 100644
--- a/src/nm-gsm-device.c
+++ b/src/nm-gsm-device.c
@@ -328,7 +328,7 @@ schedule_automatic_registration_again (NMGsmDevice *self)
 	if (priv->pending_id)
 		g_source_remove (priv->pending_id);
 
-	priv->pending_id = g_idle_add (automatic_registration_again, self);
+	priv->pending_id = g_timeout_add (1000, automatic_registration_again, self);
 }
 
 static void