diff --git a/vpn-daemons/pptp/ChangeLog b/vpn-daemons/pptp/ChangeLog
index 5d4a6b9b9..66c206790 100644
--- a/vpn-daemons/pptp/ChangeLog
+++ b/vpn-daemons/pptp/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-21  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-pptp-service.c
+		- (state_changed_cb): remove the timeout handler when it's no longer
+			needed either; if pppd died on startup (wrong options) then the
+			timeout wouldn't have been removed before
+
 2008-07-20  Dan Williams  <dcbw@redhat.com>
 
 	Port to NM 0.7 VPN plugin API
diff --git a/vpn-daemons/pptp/src/nm-pptp-service.c b/vpn-daemons/pptp/src/nm-pptp-service.c
index d569883db..5d81a2778 100644
--- a/vpn-daemons/pptp/src/nm-pptp-service.c
+++ b/vpn-daemons/pptp/src/nm-pptp-service.c
@@ -944,6 +944,7 @@ state_changed_cb (GObject *object, NMVPNServiceState state, gpointer user_data)
 	case NM_VPN_SERVICE_STATE_STARTED:
 	case NM_VPN_SERVICE_STATE_STOPPING:
 	case NM_VPN_SERVICE_STATE_STOPPED:
+		remove_timeout_handler (NM_PPTP_PLUGIN (object));
 		if (priv->service) {
 			g_object_unref (priv->service);
 			priv->service = NULL;