diff --git a/ChangeLog b/ChangeLog
index 2ea59ac4f6..dc3c321a34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-19  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* gst/rawparse/gstrawparse.c: (gst_raw_parse_loop),
+	(gst_raw_parse_handle_seek_push):
+	Improve debugging a bit and for handling multiple frames per buffer
+	in pull mode choose the next smallest multiply of framesize below
+	4096 instead of always handling 1024 frames.
+
 2008-01-19  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	Patch by: Wouter Cloetens <wouter at mind dot be>
diff --git a/gst/rawparse/gstrawparse.c b/gst/rawparse/gstrawparse.c
index 840d056af9..16a6b9f75b 100644
--- a/gst/rawparse/gstrawparse.c
+++ b/gst/rawparse/gstrawparse.c
@@ -297,7 +297,7 @@ gst_raw_parse_loop (GstElement * element)
   }
 
   if (rp_class->multiple_frames_per_buffer)
-    size = 1024 * rp->framesize;
+    size = 4096 - (4096 % rp->framesize);
   else
     size = rp->framesize;
 
@@ -651,7 +651,12 @@ gst_raw_parse_handle_seek_push (GstRawParse * rp, GstEvent * event)
           start, stop_type, stop);
 
       ret = gst_pad_push_event (rp->sinkpad, event);
+    } else {
+      GST_DEBUG_OBJECT (rp, "Seek failed: couldn't convert to byte positions");
     }
+  } else {
+    GST_DEBUG_OBJECT (rp,
+        "seeking is only supported in TIME or DEFAULT format");
   }
   return ret;
 }