diff -Nru NetworkManager-0.9.4.0.orig/src/nm-device-wifi.c NetworkManager-0.9.4.0/src/nm-device-wifi.c
--- NetworkManager-0.9.4.0.orig/src/nm-device-wifi.c	2012-03-22 17:49:43.000000000 +0100
+++ NetworkManager-0.9.4.0/src/nm-device-wifi.c	2012-05-03 12:26:47.861700288 +0200
@@ -2426,8 +2426,8 @@
 
 	priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 
-	/* Set up a timeout on the connection attempt to fail it after 25 seconds */
-	id = g_timeout_add_seconds (25, supplicant_connection_timeout_cb, self);
+	/* Set up a timeout on the connection attempt to fail it after 90 seconds */
+	id = g_timeout_add_seconds (90, supplicant_connection_timeout_cb, self);
 	if (id == 0) {
 		nm_log_err (LOGD_DEVICE | LOGD_WIFI,
 		            "Activation (%s/wireless): couldn't start supplicant "