diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c
index c7a51c05db..3895a7d83e 100644
--- a/src/modem-manager/nm-modem.c
+++ b/src/modem-manager/nm-modem.c
@@ -205,7 +205,7 @@ ppp_stage3_ip4_config_start (NMDevice *device, NMDeviceStateReason *reason)
 									  nm_act_request_get_connection (req));
 
 	priv->ppp_manager = nm_ppp_manager_new (nm_device_get_iface (device));
-	if (nm_ppp_manager_start (priv->ppp_manager, req, ppp_name, &err)) {
+	if (nm_ppp_manager_start (priv->ppp_manager, req, ppp_name, 20, &err)) {
 		g_signal_connect (priv->ppp_manager, "state-changed",
 						  G_CALLBACK (ppp_state_changed),
 						  device);
diff --git a/src/nm-device-bt.c b/src/nm-device-bt.c
index 0ced44fd22..444c7ff056 100644
--- a/src/nm-device-bt.c
+++ b/src/nm-device-bt.c
@@ -423,7 +423,7 @@ ppp_stage3_start (NMDevice *device, NMDeviceStateReason *reason)
 	}
 
 	priv->ppp_manager = nm_ppp_manager_new (priv->rfcomm_iface);
-	if (nm_ppp_manager_start (priv->ppp_manager, req, ppp_name, &err)) {
+	if (nm_ppp_manager_start (priv->ppp_manager, req, ppp_name, 20, &err)) {
 		g_signal_connect (priv->ppp_manager, "state-changed",
 						  G_CALLBACK (ppp_state_changed),
 						  device);
diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c
index 672a902c28..fab68ada61 100644
--- a/src/nm-device-ethernet.c
+++ b/src/nm-device-ethernet.c
@@ -1302,7 +1302,7 @@ pppoe_stage3_ip4_config_start (NMDeviceEthernet *self, NMDeviceStateReason *reas
 	g_assert (s_pppoe);
 
 	priv->ppp_manager = nm_ppp_manager_new (nm_device_get_iface (NM_DEVICE (self)));
-	if (nm_ppp_manager_start (priv->ppp_manager, req, nm_setting_pppoe_get_username (s_pppoe), &err)) {
+	if (nm_ppp_manager_start (priv->ppp_manager, req, nm_setting_pppoe_get_username (s_pppoe), 30, &err)) {
 		g_signal_connect (priv->ppp_manager, "state-changed",
 					   G_CALLBACK (ppp_state_changed),
 					   self);
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index cb914fd9fd..d3c9f6e94b 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -66,7 +66,6 @@ static gboolean impl_ppp_manager_set_ip4_config (NMPPPManager *manager,
 #include "nm-ppp-manager-glue.h"
 
 #define NM_PPPD_PLUGIN PLUGINDIR "/nm-pppd-plugin.so"
-#define NM_PPP_WAIT_PPPD 20 /* seconds */
 #define PPP_MANAGER_SECRET_TRIES "ppp-manager-secret-tries"
 
 typedef struct {
@@ -879,6 +878,7 @@ gboolean
 nm_ppp_manager_start (NMPPPManager *manager,
                       NMActRequest *req,
                       const char *ppp_name,
+                      guint32 timeout_secs,
                       GError **err)
 {
 	NMPPPManagerPrivate *priv;
@@ -930,7 +930,7 @@ nm_ppp_manager_start (NMPPPManager *manager,
 	nm_debug ("ppp started with pid %d", priv->pid);
 
 	priv->ppp_watch_id = g_child_watch_add (priv->pid, (GChildWatchFunc) ppp_watch_cb, manager);
-	priv->ppp_timeout_handler = g_timeout_add_seconds (NM_PPP_WAIT_PPPD, pppd_timed_out, manager);
+	priv->ppp_timeout_handler = g_timeout_add_seconds (timeout_secs, pppd_timed_out, manager);
 	priv->act_req = g_object_ref (req);
 
  out:
diff --git a/src/ppp-manager/nm-ppp-manager.h b/src/ppp-manager/nm-ppp-manager.h
index 30de95b7c0..a0200973f1 100644
--- a/src/ppp-manager/nm-ppp-manager.h
+++ b/src/ppp-manager/nm-ppp-manager.h
@@ -60,6 +60,7 @@ NMPPPManager *nm_ppp_manager_new (const char *iface);
 gboolean nm_ppp_manager_start (NMPPPManager *manager,
                                NMActRequest *req,
                                const char *ppp_name,
+                               guint32 timeout_secs,
                                GError **err);
 
 void     nm_ppp_manager_update_secrets (NMPPPManager *manager,