diff --git a/ChangeLog b/ChangeLog
index 5e6b59e6b8..d3874b6bb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-21  Julien MOUTTE  <julien@moutte.net>
+
+	* examples/gstplay/player.c: (got_time_tick), (got_stream_length),
+	(got_video_size), (main): using g_print instead of g_message.
+	* gst-libs/gst/play/gstplay.c: (gst_play_pipeline_setup): Fixing EOS 
+	signal which was not emitted because of "switch" element added to the
+	bin but not connected. (Removing from the bin temporarily)
+
 2003-12-21  Julien MOUTTE  <julien@moutte.net>
 
 	* configure.ac: X_DISPLAY_MISSING is set to 1 if AC_PATH_XTRA fails to
diff --git a/examples/gstplay/player.c b/examples/gstplay/player.c
index ef58e32633..76a735fc9c 100644
--- a/examples/gstplay/player.c
+++ b/examples/gstplay/player.c
@@ -58,20 +58,20 @@ got_found_tag (GstPlay *play,GstElement *source, GstTagList *tag_list)
 static void
 got_time_tick (GstPlay *play, gint64 time_nanos)
 {
-  g_message ("time tick %llu", time_nanos);
+  g_print ("time tick %llu", time_nanos);
 }
 
 static void
 got_stream_length (GstPlay *play, gint64 length_nanos)
 {
-  g_message ("got length %llu", length_nanos);
+  g_print ("got length %llu", length_nanos);
   length = length_nanos;
 }
 
 static void
 got_video_size (GstPlay *play, gint width, gint height)
 {
-  g_message ("got video size %d, %d", width, height);
+  g_print ("got video size %d, %d", width, height);
 }
 
 static void
@@ -128,6 +128,7 @@ main (int argc, char *argv[])
   /* Setting location we want to play */
   gst_play_set_location (play, argv[1]);
 
+  /* Uncomment that line to get an XML dump of the pipeline */
   /* gst_xml_write_file (GST_ELEMENT (play), stdout); */
 
   g_signal_connect (G_OBJECT (play), "time_tick",