diff --git a/ChangeLog b/ChangeLog
index 4e3e48d0b9..cb88082e1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-05  David Schleef  <ds@schleef.org>
+
+	* gst/mpegstream/gstrfc2250enc.c: (gst_rfc2250_enc_add_slice):
+	Fix code that ignores return value of gst_buffer_merge().
+	(bug #114560)
+	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_descramble_segment):
+	* gst/mpegstream/gstrfc2250enc.c: (gst_rfc2250_enc_add_slice): same
+	* testsuite/gst-lint:  Check for above.
+
 2004-03-05  David Schleef  <ds@schleef.org>
 
 	* gst/udp/gstudpsrc.c: (gst_udpsrc_get):  Check for unfixed