diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index bac262841fa67b843abe3a86ad789e42f0bed2cc..801e8fedb62a700f3f33dc415bd9017754e35415 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -63,6 +63,8 @@ CodecTags ff_mkv_codec_tags[]={
     {"S_TEXT/UTF8"      , CODEC_ID_TEXT},
     {"S_TEXT/ASS"       , CODEC_ID_TEXT},
     {"S_TEXT/SSA"       , CODEC_ID_TEXT},
+    {"S_ASS"            , CODEC_ID_TEXT},
+    {"S_SSA"            , CODEC_ID_TEXT},
     {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
 
     {NULL               , CODEC_ID_NONE}
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index b7d8cd649797898c2b782bb9b71b7ac605f46e64..532ccd8c835a4fae043d15b73cd47724761c70db 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2147,7 +2147,9 @@ matroska_read_header (AVFormatContext    *s,
             else if (codec_id == CODEC_ID_TEXT) {
                 MatroskaSubtitleTrack *subtrack=(MatroskaSubtitleTrack *)track;
                 if (!strcmp(track->codec_id, "S_TEXT/ASS") ||
-                    !strcmp(track->codec_id, "S_TEXT/SSA"))
+                    !strcmp(track->codec_id, "S_TEXT/SSA") ||
+                    !strcmp(track->codec_id, "S_ASS") ||
+                    !strcmp(track->codec_id, "S_SSA"))
                     subtrack->ass = 1;
             }