diff --git a/ChangeLog b/ChangeLog
index 6ed91c71eb..a56c0d689f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-24  Dan Williams  <dcbw@redhat.com>
+
+	* src/backends/NetworkManagerRedHat.c
+		- (nm_system_update_dns): be a lot smarter about telling nscd to restart
+
 2007-10-23  Dan Williams  <dcbw@redhat.com>
 
 	* libnm-util/nm-setting.c
diff --git a/src/backends/NetworkManagerRedHat.c b/src/backends/NetworkManagerRedHat.c
index decc691796..e79768e44e 100644
--- a/src/backends/NetworkManagerRedHat.c
+++ b/src/backends/NetworkManagerRedHat.c
@@ -228,15 +228,10 @@ void nm_system_kill_all_dhcp_daemons (void)
  */
 void nm_system_update_dns (void)
 {
-#ifdef NM_NO_NAMED
-	if (nm_spawn_process ("/etc/init.d/nscd status") != 0)
-		nm_spawn_process ("/etc/init.d/nscd restart");
-
-	nm_info ("Clearing nscd hosts cache.");
-	nm_spawn_process ("/usr/sbin/nscd -i hosts");
-#else
-	nm_spawn_process ("/usr/bin/killall -q nscd");
-#endif
+	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE | G_FILE_TEST_IS_REGULAR)) {
+		nm_spawn_process ("/etc/init.d/nscd condrestart");
+		nm_spawn_process ("/usr/sbin/nscd -i hosts");
+	}
 }