diff --git a/src/metadataID3v2.ml b/src/metadataID3v2.ml
index 040d2a6..3ebb829 100644
--- a/src/metadataID3v2.ml
+++ b/src/metadataID3v2.ml
@@ -58,23 +58,38 @@ let normalize_id = function
   | "TALB" -> "album"
   | "TBPM" -> "bpm"
   | "TCOM" -> "composer"
-  | "TCON" -> "content"
+  | "TCON" -> "genre"
   | "TCOP" -> "copyright"
   | "TDAT" -> "date"
   | "TDOR" -> "original release time"
   | "TDRC" -> "recording time"
-  | "TENC" -> "encoder"
+  | "TENC" -> "encodedby"
+  | "TEXT" -> "lyricist"
+  | "TIT1" -> "grouping"
   | "TIT2" -> "title"
+  | "TIT3" -> "subtitle"
+  | "TKEY" -> "key"
   | "TLAN" -> "language"
   | "TLEN" -> "length"
-  | "TMED" -> "media type"
-  | "TOPE" -> "performer"
+  | "TMED" -> "media"
+  | "TOAL" -> "originalalbum"
+  | "TOFN" -> "originalfilename"
+  | "TOPE" -> "originalartist"
+  | "TPOS" -> "discnumber"
   | "TPE1" -> "artist"
-  | "TPE2" -> "band"
-  | "TPUB" -> "publisher"
+  | "TPE2" -> "albumartist"
+  | "TPE3" -> "conductor"
+  | "TPE4" -> "remixer"
+  | "TPUB" -> "label"
   | "TRCK" -> "tracknumber"
+  | "TSOA" -> "albumsort"
+  | "TSO2" -> "albumartistsort"
+  | "TSOT" -> "titlesort"
+  | "TSRC" -> "isrc"
   | "TSSE" -> "encoder"
+  | "TSST" -> "discsubtitle"
   | "TYER" -> "year"
+  | "WOAR" -> "website"
   | "WXXX" -> "url"
   | id -> id
 
diff --git a/src/metadataMP4.ml b/src/metadataMP4.ml
index 6b1e03f..0a7fbe5 100644
--- a/src/metadataMP4.ml
+++ b/src/metadataMP4.ml
@@ -5,9 +5,12 @@ let tagn =
   [
     ("\xa9nam", "title");
     ("\xa9ART", "artist");
+    ("cprt", "copyright");
     ("\xa9too", "encoder");
     ("\xa9day", "date");
     ("\xa9cpy", "copyright");
+    ("\xa9gen", "genre");
+    ("\xa9wrt", "composer");
     ("\xa9alb", "album");
     ("\xa9des", "description");
     ("\xa9cmt", "comment");