diff --git a/ChangeLog b/ChangeLog
index e52320285c..5c2604849b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-05-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* ext/jpeg/gstjpegenc.c: (gst_jpegenc_get_type),
+	(gst_jpegenc_chain):
+        fix DURATION on outgoing buffers
+	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_handle_sink_event):
+        debug using time formats
+	* sys/ximage/ximagesink.c: (gst_ximagesink_xcontext_get):
+	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_get_xv_support),
+	(gst_xvimagesink_sink_link):
+        windows with width/height 0 generate X errors, so don't allow them
+
 2004-05-05  Wim Taymans  <wim@fluendo.com>
 
 	* ext/mpeg2dec/gstmpeg2dec.c: (src_templ),
diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c
index 696d9612f0..97efeafd8b 100644
--- a/ext/jpeg/gstjpegenc.c
+++ b/ext/jpeg/gstjpegenc.c
@@ -389,6 +389,7 @@ gst_jpegenc_chain (GstPad * pad, GstData * _data)
   outsize = GST_BUFFER_SIZE (outbuf) = jpegenc->bufsize;
   outdata = GST_BUFFER_DATA (outbuf) = g_malloc (outsize);
   GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf);
+  GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (buf);
 
   width = jpegenc->width;
   height = jpegenc->height;