Index: libhb/muxmp4.c
===================================================================
--- libhb/muxmp4.c	(revision 4503)
+++ libhb/muxmp4.c	(working copy)
@@ -1315,6 +1315,14 @@
             MP4TagsSetAlbum( tags, md->album );
         if( strlen( md->genre ))
             MP4TagsSetGenre( tags, md->genre );
+        if( strlen( md->tvshow ) )
+            MP4TagsSetTVShow( tags, md->tvshow );
+        if( md->season )
+            MP4TagsSetTVSeason( tags, &md->season );
+        if( md->episode )
+            MP4TagsSetTVEpisode( tags, &md->episode );
+        if( md->media_type )
+            MP4TagsSetMediaType( tags, &md->media_type );
 
         if( md->coverart )
         {
Index: libhb/decmetadata.c
===================================================================
--- libhb/decmetadata.c	(revision 4503)
+++ libhb/decmetadata.c	(working copy)
@@ -49,6 +49,18 @@
         if( tags->genre )
             strncpy( title->metadata->genre, tags->genre, sizeof(title->metadata->genre) );
 
+        if( tags->tvShow )
+            strncpy( title->metadata->tvshow, tags->tvShow, sizeof(title->metadata->tvshow) );
+
+        if( tags->tvSeason )
+            title->metadata->season = *tags->tvSeason;
+
+        if( tags->tvEpisode )
+            title->metadata->episode = *tags->tvEpisode;
+
+        if( tags->mediaType )
+            title->metadata->media_type = *tags->mediaType;
+
         if( tags->artworkCount > 0 ) {
             const MP4TagArtwork* art = tags->artwork + 0; // first element
             title->metadata->coverart = (uint8_t*)malloc( art->size );
Index: libhb/common.h
===================================================================
--- libhb/common.h	(revision 4503)
+++ libhb/common.h	(working copy)
@@ -645,6 +645,10 @@
     char  comment[1024];
     char  album[255];
     char  genre[255];
+    char  tvshow[255];
+    uint32_t season;
+    uint32_t episode;
+    uint8_t  media_type;
     uint32_t coverart_size;
     uint8_t *coverart;
 };