diff --git a/ChangeLog b/ChangeLog
index d439c2ea96..e17eda2e4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-17  Edward Hervey  <edward@fluendo.com>
+
+	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_file):
+	Take into account the file properties preroll value for
+	timestamping/newsegment. It's weird this value was commented out.
+
 2006-02-16  Wim Taymans  <wim@fluendo.com>
 
 	* gst/asfdemux/Makefile.am:
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index f7f1f2ff25..7d6a1f5951 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -1408,7 +1408,10 @@ gst_asf_demux_process_file (GstASFDemux * demux, guint8 ** p_data,
   /* FIXME: do we need object.send_time as well? what is it? */
 
   demux->play_time = (guint64) object.play_time * (GST_SECOND / 10000000);
-  demux->preroll = 0;           /* object.preroll; */
+  demux->preroll = object.preroll;
+  GST_DEBUG_OBJECT (demux,
+      "play_time %" GST_TIME_FORMAT " preroll %" GST_TIME_FORMAT,
+      GST_TIME_ARGS (demux->play_time), GST_TIME_ARGS (demux->preroll));
 
   gst_segment_set_duration (&demux->segment, GST_FORMAT_TIME, demux->play_time);