diff --git a/ChangeLog b/ChangeLog
index 6c3324ff54..578b3e69ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-02  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: José Alburquerque <jaalburqu svn gnome org>
+
+	* gst/playback/gstplaybin2.c:
+	  Make the function signature of the _get_*_tags() functions match
+	  the signature of the vfuncs they implement, ie. return a
+	  GstTagList rather than a GstStructure, which is more correct,
+	  even if one is typedef'ed to the other (#518940).
+
 2008-03-02  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst-libs/gst/rtsp/gstrtspconnection.c:
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index 2b964af0db..008b5810de 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -430,11 +430,11 @@ static GstStateChangeReturn gst_play_bin_change_state (GstElement * element,
 
 static void gst_play_bin_handle_message (GstBin * bin, GstMessage * message);
 
-static GstStructure *gst_play_bin_get_video_tags (GstPlayBin * playbin,
+static GstTagList *gst_play_bin_get_video_tags (GstPlayBin * playbin,
     gint stream);
-static GstStructure *gst_play_bin_get_audio_tags (GstPlayBin * playbin,
+static GstTagList *gst_play_bin_get_audio_tags (GstPlayBin * playbin,
     gint stream);
-static GstStructure *gst_play_bin_get_text_tags (GstPlayBin * playbin,
+static GstTagList *gst_play_bin_get_text_tags (GstPlayBin * playbin,
     gint stream);
 
 static GstBuffer *gst_play_bin_convert_frame (GstPlayBin * playbin,