diff --git a/ChangeLog b/ChangeLog
index ada5401e2e..5c305f1632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-25  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/playback/gstplaybin.c: (gst_play_bin_get_property):
+	  Make getting the current frame thread-safe.
+
 2007-01-25  Edward Hervey  <edward@fluendo.com>
 
 	* gst/playback/gstdecodebin2.c: (gst_decode_bin_finalize),
diff --git a/gst/playback/gstplaybin.c b/gst/playback/gstplaybin.c
index 815afe4791..a6a52f8d68 100644
--- a/gst/playback/gstplaybin.c
+++ b/gst/playback/gstplaybin.c
@@ -759,9 +759,13 @@ gst_play_bin_get_property (GObject * object, guint prop_id, GValue * value,
     case ARG_VOLUME:
       g_value_set_double (value, play_bin->volume);
       break;
-    case ARG_FRAME:
-      gst_value_set_mini_object (value, GST_MINI_OBJECT (play_bin->frame));
+    case ARG_FRAME:{
+      GstBuffer *cur_frame = NULL;
+
+      gst_buffer_replace (&cur_frame, play_bin->frame);
+      gst_value_take_buffer (value, cur_frame);
       break;
+    }
     case ARG_CONNECTION_SPEED:
       g_value_set_uint (value, play_bin->connection_speed / 1000);
       break;