diff --git a/ChangeLog b/ChangeLog
index 022567f8d4..e8e8650886 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-17  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	Patch by: Milosz Derezynski <internalerror at gmail dot com>
+
+	* ext/gio/gstgiobasesrc.c: (gst_gio_base_src_create):
+	  If seeking to a new position succeeds don't simply return from
+	  create() without creating a buffer. Do this only in the case
+	  seeking to the new position fails. Fixes bug #523054.
+
 2008-03-17  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst-libs/gst/video/video.c: (gst_video_format_parse_caps),
diff --git a/ext/gio/gstgiobasesrc.c b/ext/gio/gstgiobasesrc.c
index ff63554df5..777d7de1d9 100644
--- a/ext/gio/gstgiobasesrc.c
+++ b/ext/gio/gstgiobasesrc.c
@@ -309,7 +309,8 @@ gst_gio_base_src_create (GstBaseSrc * base_src, guint64 offset, guint size,
 
     if (ret == GST_FLOW_OK)
       src->position = offset;
-    return ret;
+    else
+      return ret;
   }
 
   buf = gst_buffer_new_and_alloc (size);