diff --git a/ChangeLog b/ChangeLog
index a96e06d74e..6735e8cadd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-16  Wim Taymans  <wim.taymans@gmail.com>
+
+	* gst-libs/gst/app/gstappsink.c: (gst_app_sink_class_init):
+	Override the preroll vmethod instead of overriding the render method
+	twice.
+
 2007-08-16  Wim Taymans  <wim.taymans@gmail.com>
 
 	* gst/rtpmanager/gstrtpjitterbuffer.c:
diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c
index ee8c919078..b4c65af820 100644
--- a/gst-libs/gst/app/gstappsink.c
+++ b/gst-libs/gst/app/gstappsink.c
@@ -91,7 +91,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
   basesink_class->start = gst_app_sink_start;
   basesink_class->stop = gst_app_sink_stop;
   basesink_class->event = gst_app_sink_event;
-  basesink_class->render = gst_app_sink_preroll;
+  basesink_class->preroll = gst_app_sink_preroll;
   basesink_class->render = gst_app_sink_render;
   basesink_class->get_caps = gst_app_sink_get_caps;
 }