2 files changed, 18 insertions, 0 deletions

diff --git a/apps/metadata/metadata_common.c b/apps/metadata/metadata_common.c
index d1a1087188..e3579473f0 100644
--- a/apps/metadata/metadata_common.c
+++ b/apps/metadata/metadata_common.c
@@ -280,6 +280,18 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3,
     {
         p = &(id3->albumartist);
     }
+    else if (strcasecmp(name, "grouping") == 0)
+    {
+        p = &(id3->grouping);
+    }
+    else if (strcasecmp(name, "content group") == 0)
+    {
+        p = &(id3->grouping);
+    }
+    else if (strcasecmp(name, "contentgroup") == 0) 
+    {
+        p = &(id3->grouping);
+    }
     else
     {
         len = parse_replaygain(name, value, id3, buf, buf_remaining);
diff --git a/apps/metadata/mp4.c b/apps/metadata/mp4.c
index aecb4cf17f..8162cd987f 100644
--- a/apps/metadata/mp4.c
+++ b/apps/metadata/mp4.c
@@ -38,6 +38,7 @@
 #define MP4_alac MP4_ID('a', 'l', 'a', 'c')
 #define MP4_calb MP4_ID(0xa9, 'a', 'l', 'b')
 #define MP4_cART MP4_ID(0xa9, 'A', 'R', 'T')
+#define MP4_cgrp MP4_ID(0xa9, 'g', 'r', 'p')
 #define MP4_cgen MP4_ID(0xa9, 'g', 'e', 'n')
 #define MP4_cnam MP4_ID(0xa9, 'n', 'a', 'm')
 #define MP4_cwrt MP4_ID(0xa9, 'w', 'r', 't')
@@ -378,6 +379,11 @@ static bool read_mp4_tags(int fd, struct mp3entry* id3,
                 &id3->albumartist);
             break;
 
+        case MP4_cgrp:
+            read_mp4_tag_string(fd, size, &buffer, &buffer_left,
+                &id3->grouping);
+            break;
+        
         case MP4_calb:
             read_mp4_tag_string(fd, size, &buffer, &buffer_left,
                 &id3->album);