diff --git a/ChangeLog b/ChangeLog
index 7a8d1e7f03..ff70a59a88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-25  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* docs/gst/gstreamer-sections.txt:
+	* gst/gsttaglist.c:
+	* gst/gsttaglist.h:
+	API: add GST_TAG_COMPOSER, fixes #459809.
+
 2007-09-24  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* gst/gstplugin.c:
diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index 01b279e556..7d84ffaf22 100644
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -1839,6 +1839,7 @@ GST_TAG_ISRC
 GST_TAG_ORGANIZATION
 GST_TAG_COPYRIGHT
 GST_TAG_COPYRIGHT_URI
+GST_TAG_COMPOSER
 GST_TAG_CONTACT
 GST_TAG_LICENSE
 GST_TAG_LICENSE_URI
diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c
index 0fc54d5ddd..ddbd9afa04 100644
--- a/gst/gsttaglist.c
+++ b/gst/gsttaglist.c
@@ -174,6 +174,11 @@ _gst_tag_initialize (void)
       G_TYPE_STRING,
       _("performer"),
       _("person(s) performing"), gst_tag_merge_strings_with_comma);
+  gst_tag_register (GST_TAG_COMPOSER, GST_TAG_FLAG_META,
+      G_TYPE_STRING,
+      _("composer"),
+      _("person(s) who composed the recording"),
+      gst_tag_merge_strings_with_comma);
   gst_tag_register (GST_TAG_DURATION, GST_TAG_FLAG_DECODED,
       G_TYPE_UINT64,
       _("duration"), _("length in GStreamer time units (nanoseconds)"), NULL);
diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h
index 3fac7259c1..675ee79423 100644
--- a/gst/gsttaglist.h
+++ b/gst/gsttaglist.h
@@ -359,6 +359,14 @@ gboolean     gst_tag_list_get_date_index    (const GstTagList * list,
  * album containing this data (string)
  */
 #define GST_TAG_ALBUM                  "album"
+/**
+ * GST_TAG_COMPOSER:
+ *
+ * person(s) who composed the recording (string)
+ *
+ * Since: 0.10.15
+ */
+#define GST_TAG_COMPOSER               "composer"
 /**
  * GST_TAG_DATE:
  *