diff --git a/control-center/ChangeLog b/control-center/ChangeLog
index 3616b827c..f64516a51 100644
--- a/control-center/ChangeLog
+++ b/control-center/ChangeLog
@@ -1,5 +1,10 @@
 2001-07-26  Bradford Hovinen  <hovinen@ximian.com>
 
+	* kill-gnomecc.sh: Don't kill oafd for fear that someone may be
+	running Evolution. Kill bonobo-moniker-archiver after everything
+	else is dead. Redirect errors to /dev/null. Kill the mouse
+	properties capplet, too.
+
 	* gnomecc.glade: Don't make the main window modal
 
 	* capplet-dir.c (capplet_control_launch): Remove check for capplet
diff --git a/control-center/kill-gnomecc.sh b/control-center/kill-gnomecc.sh
index 7a1c08735..c9dca3a8b 100755
--- a/control-center/kill-gnomecc.sh
+++ b/control-center/kill-gnomecc.sh
@@ -1,12 +1,11 @@
-killall background-properties-capplet
-killall bonobo-moniker-archiver
-killall sound-properties
-killall keyboard-properties
-killall oafd
-oaf-slay
+killall background-properties-capplet 2>/dev/null
+killall sound-properties 2>/dev/null
+killall keyboard-properties 2>/dev/null
+killall mouse-properties-capplet 2>/dev/null
+killall bonobo-moniker-archiver 2>/dev/null
 
-killall -9 background-properties-capplet
-killall -9 bonobo-moniker-archiver
-killall -9 sound-properties
-killall -9 keyboard-properties
-killall -9 oafd
+killall -9 background-properties-capplet 2>/dev/null
+killall -9 sound-properties 2>/dev/null
+killall -9 keyboard-properties 2>/dev/null
+killall -9 mouse-properties-capplet 2>/dev/null
+killall -9 bonobo-moniker-archiver 2>/dev/null