diff --git a/ChangeLog b/ChangeLog
index 0fea024a32..4f3a3c762c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-27  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Roy Marples <roy@marples.name>
+
+	* src/dhcp-manager/nm-dhcp-dhcpcd.c
+		- (nm_dhcp_client_start): fixup for latest dhcpcd 4.0 RC
+
 2008-07-27  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-gsm-device.c
diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
index 9978c9f2f2..ef4a33abb8 100644
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
@@ -90,7 +90,9 @@ nm_dhcp_client_start (NMDHCPDevice *device, NMSettingIP4Config *s_ip4)
 	argv = g_ptr_array_new ();
 	g_ptr_array_add (argv, (gpointer) DHCP_CLIENT_PATH);
 
-	g_ptr_array_add (argv, (gpointer) "-X");	/* Don't fork */
+	g_ptr_array_add (argv, (gpointer) "-B");	/* Don't background on lease (disable fork()) */
+
+	g_ptr_array_add (argv, (gpointer) "-K");	/* Disable built-in carrier detection */
 
 	g_ptr_array_add (argv, (gpointer) "-L");	/* Disable built-in IPv4LL since we use avahi-autoipd */