diff --git a/ChangeLog b/ChangeLog
index c3efc9269..e22628def 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-23  Dan Williams  <dcbw@redhat.com>
+
+	* src/ppp-manager/nm-ppp-manager.c
+		- (create_pppd_cmd_line): pppd always parses /etc/ppp/options, so always
+			add really important stuff to the command line to ensure that NM
+			overrides /etc/ppp/options (bgo #556781)
+
 2008-10-22  Dan Williams  <dcbw@redhat.com>
 
 	* src/NetworkManagerSystem.c
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index abf9a0bf6..fb8f7b238 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -725,6 +725,9 @@ create_pppd_cmd_line (NMPPPManager *self,
 	nm_cmd_line_add_string (cmd, "nodetach");
 	nm_cmd_line_add_string (cmd, "lock");
 
+	/* NM handles setting the default route */
+	nm_cmd_line_add_string (cmd, "nodefaultroute");
+
 	ppp_debug = getenv ("NM_PPP_DEBUG");
 	if (ppp_debug)
 		nm_cmd_line_add_string (cmd, "debug");
@@ -797,15 +800,11 @@ create_pppd_cmd_line (NMPPPManager *self,
 		nm_cmd_line_add_int (cmd, setting->mtu);
 	}
 
-	if (setting->lcp_echo_failure) {
-		nm_cmd_line_add_string (cmd, "lcp-echo-failure");
-		nm_cmd_line_add_int (cmd, setting->lcp_echo_failure);
-	}
+	nm_cmd_line_add_string (cmd, "lcp-echo-failure");
+	nm_cmd_line_add_int (cmd, setting->lcp_echo_failure);
 
-	if (setting->lcp_echo_interval) {
-		nm_cmd_line_add_string (cmd, "lcp-echo-interval");
-		nm_cmd_line_add_int (cmd, setting->lcp_echo_interval);
-	}
+	nm_cmd_line_add_string (cmd, "lcp-echo-interval");
+	nm_cmd_line_add_int (cmd, setting->lcp_echo_interval);
 
 	nm_cmd_line_add_string (cmd, "ipparam");
 	nm_cmd_line_add_string (cmd, priv->dbus_path);