diff --git a/ChangeLog b/ChangeLog
index 0c3ddcbe75..63d740ea3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-27  Dan Williams  <dcbw@redhat.com>
+
+	* src/backends/NetworkManagerRedHat.c
+		- (nm_system_init): Kill any dhclient processes lying around as well
+			as stopping 'nifd' if its already been started.  NetworkManager
+			subsumes the functions of nifd (kicking mDNSResponder, autoip)
+
 2005-02-27  Dan Williams  <dcbw@redhat.com>
 
 	* panel-applet/NMWirelessApplet.c
diff --git a/src/backends/NetworkManagerRedHat.c b/src/backends/NetworkManagerRedHat.c
index e238347a0c..21215c8684 100644
--- a/src/backends/NetworkManagerRedHat.c
+++ b/src/backends/NetworkManagerRedHat.c
@@ -36,6 +36,12 @@
  */
 void nm_system_init (void)
 {
+	/* Kill any dhclients lying around */
+	nm_system_kill_all_dhcp_daemons ();
+
+	/* Stop nifd since we respawn mDNSResponder ourselves */
+	if (nm_spawn_process ("/etc/init.d/nifd status") != 0)
+		nm_spawn_process ("/etc/init.d/nifd stop");
 }