diff --git a/ChangeLog b/ChangeLog
index a799b54632..1e7ace5502 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-07  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* sys/ximage/ximagesink.c: (gst_ximagesink_sink_link),
+	(gst_ximagesink_set_xwindow_id), (gst_ximagesink_init):
+	* sys/ximage/ximagesink.h:
+	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_sink_link),
+	(gst_xvimagesink_set_xwindow_id), (gst_xvimagesink_init):
+	* sys/xvimage/xvimagesink.h:
+	  Actually only create a new toplevel window if we're not gonna
+	  embed it right after.
+
 2004-10-07  Wim Taymans  <wim@fluendo.com>
 
 	* gst/playback/gstplaybasebin.c: (play_base_bin_mute_pad),