diff --git a/ChangeLog b/ChangeLog
index d4ec988f60..e63c650efb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-13  Benjamin Otte  <otte@gnome.org>
+
+	* gst/gstelement.c:
+	  add documentation note about gst_element_found_tags_for_pad not
+	  being usable in getfunctions. (see #137042)
+
 2004-03-12  David Schleef  <ds@schleef.org>
 
 	* gst/gstcaps.h: jdahlin, what are you smoking?  We can't just
diff --git a/gst/gstelement.c b/gst/gstelement.c
index f52d7674c2..fba5a6dba4 100644
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -3253,6 +3253,10 @@ gst_element_found_tags (GstElement *element, const GstTagList *tag_list)
  * want to push the found tags down one pad, in that case this function is for
  * you. It takes ownership of the taglist, emits the found-tag signal and pushes 
  * a tag event down the pad.
+ * <note>This function may not be used in a #GstPadGetFunction, because it calls 
+ * gst_pad_push(). In those functions, call gst_element_found_tags(), create a 
+ * tag event with gst_event_new_tag() and return that from your 
+ * #GstPadGetFunction.</note>
  */
 void
 gst_element_found_tags_for_pad (GstElement *element, GstPad *pad, GstClockTime timestamp,