diff --git a/ChangeLog b/ChangeLog
index 53f2787f76..213e82f316 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-15  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst-libs/gst/tag/gstid3tag.c:
+	* gst-libs/gst/tag/gstvorbistag.c:
+	  Use new beats-per-minute tag from core.
+
 2007-01-15  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* po/POTFILES.in:
diff --git a/gst-libs/gst/tag/gstid3tag.c b/gst-libs/gst/tag/gstid3tag.c
index 58925becc6..73e9571eee 100644
--- a/gst-libs/gst/tag/gstid3tag.c
+++ b/gst-libs/gst/tag/gstid3tag.c
@@ -206,6 +206,7 @@ static const GstTagEntryMatch tag_matches[] = {
   {GST_TAG_ISRC, "TSRC"},
   {GST_TAG_IMAGE, "APIC"},
   {GST_TAG_ENCODER, "TSSE"},
+  {GST_TAG_BEATS_PER_MINUTE, "TBPM"},
   {NULL, NULL}
 };
 
diff --git a/gst-libs/gst/tag/gstvorbistag.c b/gst-libs/gst/tag/gstvorbistag.c
index 849af55c89..2e58174a78 100644
--- a/gst-libs/gst/tag/gstvorbistag.c
+++ b/gst-libs/gst/tag/gstvorbistag.c
@@ -41,6 +41,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+/*
+ * see http://xiph.org/ogg/vorbis/doc/v-comment.html
+ */
 static const GstTagEntryMatch tag_matches[] = {
   {GST_TAG_TITLE, "TITLE"},
   {GST_TAG_VERSION, "VERSION"},
@@ -74,6 +77,10 @@ static const GstTagEntryMatch tag_matches[] = {
   {GST_TAG_LANGUAGE_CODE, "LANGUAGE"},
   {GST_TAG_CDDA_MUSICBRAINZ_DISCID, "MUSICBRAINZ_DISCID"},
   {GST_TAG_CDDA_CDDB_DISCID, "DISCID"},
+  /* some incidence that this makes sense:
+   * http://mail.kde.org/pipermail/amarok/2006-May/000090.html
+   */
+  {GST_TAG_BEATS_PER_MINUTE, "BPM"},
   {NULL, NULL}
 };