diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 7b1bc5a64..ea92dda90 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-08  Richard Hestilow  <hestilow@ximian.com>
+
+	* gnome-settings-daemon.c (main): Initialize libgnomeui,
+	and load sounds.
+
+	* gnome-settings-sound.c (stop_esd): Just tell esd to let go
+	of /dev/dsp.
+
 2002-01-04  Bradford Hovinen  <hovinen@ximian.com>
 
 	* all: Convert from GConfEngine to GConfClient
diff --git a/gnome-settings-daemon/gnome-settings-daemon.c b/gnome-settings-daemon/gnome-settings-daemon.c
index 1f473697a..044d9200d 100644
--- a/gnome-settings-daemon/gnome-settings-daemon.c
+++ b/gnome-settings-daemon/gnome-settings-daemon.c
@@ -28,7 +28,9 @@
 #include <gdk/gdkx.h>
 
 #include <gconf/gconf.h>
-
+#include <libgnome/gnome-init.h>
+#include <libgnomeui/gnome-ui-init.h>
+#include <config.h>
 #include "xsettings-manager.h"
 #include "gnome-settings-daemon.h"
 
@@ -133,8 +135,9 @@ main (int argc, char **argv)
   gboolean terminated = FALSE;
   GConfClient *client;
   GSList *list;
-  gtk_init (&argc, &argv);  
-  
+  gnome_program_init ("control-center", VERSION, LIBGNOMEUI_MODULE,
+		      argc, argv, NULL);
+
   if (xsettings_manager_check_running (gdk_display, DefaultScreen (gdk_display)))
     {
       fprintf (stderr, "You can only run one xsettings manager at a time; exiting");
@@ -188,6 +191,7 @@ main (int argc, char **argv)
 
   gnome_settings_xsettings_load (client);
   gnome_settings_mouse_load (client);
+  gnome_settings_sound_load (client);
   
   if (!terminated)
     gtk_main ();
diff --git a/gnome-settings-daemon/gnome-settings-sound.c b/gnome-settings-daemon/gnome-settings-sound.c
index 44205c691..1b6001b3a 100644
--- a/gnome-settings-daemon/gnome-settings-sound.c
+++ b/gnome-settings-daemon/gnome-settings-sound.c
@@ -52,6 +52,7 @@ start_esd (void)
         time_t starttime;
         GnomeClient *client = gnome_master_client ();
 
+	g_print ("Starting esd\n");
         esdpid = gnome_execute_async (NULL, 2, (char **)esd_cmdline);
         g_snprintf (argbuf, sizeof (argbuf), "%d", esdpid);
         tmpargv[0] = "kill"; tmpargv[1] = argbuf; tmpargv[2] = NULL;
@@ -76,6 +77,9 @@ start_esd (void)
 static void
 stop_esd (void) 
 {
+	g_print ("Stopping esd\n");
+	/* Can't think of a way to do this reliably, so we fake it for now */
+	esd_standby (gnome_sound_connection_get ());
 }
 
 /* reload_foreach_cb
@@ -148,6 +152,7 @@ apply_settings (void)
 	if (!inited || event_changed_old != event_changed_new)
 	{
 		SoundProperties *props;
+		g_print ("Reloading events\n");
 		
 		inited = TRUE;
 		event_changed_old = event_changed_new;