3 files changed, 13 insertions, 0 deletions

diff --git a/apps/metadata/asf.c b/apps/metadata/asf.c
index fa1308b560..255a0bcba4 100644
--- a/apps/metadata/asf.c
+++ b/apps/metadata/asf.c
@@ -465,6 +465,9 @@ static int asf_parse_header(int fd, struct mp3entry* id3,
                                 id3buf = value;
                                 id3buf_remaining = buf_len;
                             }
+                        } else if (!strcmp("MusicBrainz/Track Id", utf8buf)) {
+                            id3->mb_track_id = id3buf;
+                            asf_utf16LEdecode(fd, length, &id3buf, &id3buf_remaining);
                         } else {
                             lseek(fd, length, SEEK_CUR);
                         }
diff --git a/apps/metadata/metadata_common.c b/apps/metadata/metadata_common.c
index 1fff030e57..e4df874cff 100644
--- a/apps/metadata/metadata_common.c
+++ b/apps/metadata/metadata_common.c
@@ -293,6 +293,11 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3,
     {
         p = &(id3->grouping);
     }
+    else if (strcasecmp(name, "musicbrainz_trackid") == 0
+        || strcasecmp(name, "http://musicbrainz.org") == 0 )
+    {
+        p = &(id3->mb_track_id);
+    }
     else
     {
         len = parse_replaygain(name, value, id3, buf, buf_remaining);
diff --git a/apps/metadata/mp4.c b/apps/metadata/mp4.c
index 187459b7fb..493bc48da7 100644
--- a/apps/metadata/mp4.c
+++ b/apps/metadata/mp4.c
@@ -498,6 +498,11 @@ static bool read_mp4_tags(int fd, struct mp3entry* id3,
                     DEBUGF("AAC: lead_trim %d, tail_trim %d\n", 
                         id3->lead_trim, id3->tail_trim);
                 }
+                else if (strcasecmp(tag_name, "musicbrainz track id") == 0)
+                {
+                    read_mp4_tag_string(fd, size, &buffer, &buffer_left,
+                        &id3->mb_track_id);
+                }
                 else
                 {
                     char* any;