Index: network-manager-1.2.2/src/settings/nm-secret-agent.c
===================================================================
--- network-manager-1.2.2.orig/src/settings/nm-secret-agent.c
+++ network-manager-1.2.2/src/settings/nm-secret-agent.c
@@ -344,6 +344,7 @@ nm_secret_agent_get_secrets (NMSecretAge
 	static const char *no_hints[] = { NULL };
 	GVariant *dict;
 	Request *r;
+	gint saved_timeout;
 
 	g_return_val_if_fail (NM_IS_SECRET_AGENT (self), NULL);
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
@@ -362,6 +363,10 @@ nm_secret_agent_get_secrets (NMSecretAge
 	r = request_new (self, "GetSecrets", path, setting_name, callback, callback_data);
 	r->is_get_secrets = TRUE;
 	g_hash_table_add (priv->requests, r);
+
+	/* Increase the timeout only for this call */
+	saved_timeout = g_dbus_proxy_get_default_timeout (G_DBUS_PROXY (priv->proxy));
+	g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (priv->proxy), 120000);
 	nmdbus_secret_agent_call_get_secrets (priv->proxy,
 	                                      dict,
 	                                      path,
@@ -370,6 +375,7 @@ nm_secret_agent_get_secrets (NMSecretAge
 	                                      flags,
 	                                      r->cancellable,
 	                                      get_callback, r);
+	g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (priv->proxy), saved_timeout);
 
 	return r;
 }