diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 93f22cab15..21c09d13b4 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -72,6 +72,7 @@ const AVMetadataConv ff_id3v2_4_metadata_conv[] = {
     { "TSOA", "album-sort"    },
     { "TSOP", "artist-sort"   },
     { "TSOT", "title-sort"    },
+    { "TSST", "disc_subtitle" },
     { "TIT1", "grouping"      },
     { 0 }
 };
diff --git a/tests/ref/fate/generic-tags-remux-mp3 b/tests/ref/fate/generic-tags-remux-mp3
index b9db1b3102..6fa9c1b41f 100644
--- a/tests/ref/fate/generic-tags-remux-mp3
+++ b/tests/ref/fate/generic-tags-remux-mp3
@@ -6,7 +6,7 @@ ID3v2 frame TCOM (18 bytes):|.Anthony Gonzalez.|
 ID3v2 frame TCOP (24 bytes):|.2011 M83 Recording Inc.|
 ID3v2 frame TDRC (12 bytes):|.2011-10-17.|
 ID3v2 frame TPOS (3 bytes):|.1.|
-ID3v2 frame TXXX (24 bytes):|.disc_subtitle.Hurry Up.|
+ID3v2 frame TSST (10 bytes):|.Hurry Up.|
 ID3v2 frame TENC (5 bytes):|.Tau.|
 ID3v2 frame TXXX (20 bytes):|.filename.Intro.mp3.|
 ID3v2 frame TCON (12 bytes):|.Electronic.|