diff --git a/ChangeLog b/ChangeLog
index 5280c44ad8..edf102cc68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-03  Julien MOUTTE <julien@moutte.net>
+
+	* gst-libs/gst/gconf/gconf.c: (gst_gconf_get_default_video_sink):
+	Using ximagesink as a default if no gconf key found. We should
+	probably consider using alsasink instead of osssink for the audio
+	part.
+
 2004-03-02  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac:
diff --git a/gst-libs/gst/gconf/gconf.c b/gst-libs/gst/gconf/gconf.c
index ba30a89498..a96b786f7d 100644
--- a/gst-libs/gst/gconf/gconf.c
+++ b/gst-libs/gst/gconf/gconf.c
@@ -231,12 +231,12 @@ gst_gconf_get_default_video_sink (void)
   GstElement *ret = gst_gconf_render_bin_from_key ("default/videosink");
   
   if (!ret) {
-    ret = gst_element_factory_make ("xvideosink", NULL);
+    ret = gst_element_factory_make ("ximagesink", NULL);
   
     if (!ret)
-      g_warning ("No GConf default video sink key and xvideosink doesn't work");
+      g_warning ("No GConf default video sink key and ximagesink doesn't work");
     else
-      g_print ("GConf video sink not found, using xvideosink\n");
+      g_print ("GConf video sink not found, using ximagesink\n");
   }
 
   return ret;