diff --git a/etc/codecs.conf b/etc/codecs.conf
index 97b5ecca97..559de7f439 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1597,6 +1597,14 @@ videocodec ffvp6
   dll "vp6"
   out YV12
 
+videocodec ffvp6a
+  info "FFmpeg VP6A decoder"
+  status untested
+  fourcc VP6A
+  driver ffmpeg
+  dll "vp6a"
+  out I420,YUY2,YV12
+
 videocodec ffvp6f
   info "FFmpeg VP6 Flash decoder"
   status working
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 4466c04f3d..d6e4f94de5 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -78,6 +78,7 @@ static const AVCodecTag mp_bmp_tags[] = {
     { CODEC_ID_THP,               MKTAG('T', 'H', 'P', 'V')},
     { CODEC_ID_TIERTEXSEQVIDEO,   MKTAG('T', 'S', 'E', 'Q')},
     { CODEC_ID_TXD,               MKTAG('T', 'X', 'D', 'V')},
+    { CODEC_ID_VP6A,              MKTAG('V', 'P', '6', 'A')},
     { CODEC_ID_VMDVIDEO,          MKTAG('V', 'M', 'D', 'V')},
     { CODEC_ID_WS_VQA,            MKTAG('V', 'Q', 'A', 'V')},
     { CODEC_ID_XAN_WC3,           MKTAG('W', 'C', '3', 'V')},