diff --git a/ChangeLog b/ChangeLog
index 3600e20b8e..641894084f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-30  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-device-802-11-wireless.c
+		- (supplicant_monitor_start): increase connect/auth timeout to
+			20 seconds from 10 seconds
+
 2006-01-30  Dan Williams  <dcbw@redhat.com>
 
 	* src/Makefile.am
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index 585461d174..1e14a02a74 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -2539,8 +2539,8 @@ supplicant_monitor_start (NMDevice80211Wireless *self)
 	g_source_set_callback (self->priv->sup_status, (GSourceFunc) supplicant_status_cb, self, NULL);
 	g_source_attach (self->priv->sup_status, context);
 
-	/* Set up a timeout on the association to kill it after 10s */
-	self->priv->sup_timeout = g_timeout_source_new (10000);
+	/* Set up a timeout on the association to kill it after 20s */
+	self->priv->sup_timeout = g_timeout_source_new (20000);
 	g_source_set_callback (self->priv->sup_timeout, supplicant_timeout_cb, self, NULL);
 	g_source_attach (self->priv->sup_timeout, context);