diff --git a/etc/codecs.conf b/etc/codecs.conf
index aa539fbdcf..97b5ecca97 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -9,6 +9,15 @@ release 20070930
 ;                   VIDEO CODECS
 ;=============================================================================
 
+videocodec ffmvi1
+  info "FFmpeg Motion Pixels Decoder"
+  status working
+  fourcc MVI1 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll motionpixels
+  out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
+  out YV12,YUY2
+
 videocodec ffmdec
   info "FFmpeg Sony PlayStation MDEC (Motion DECoder)"
   status working
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 39e8b76d92..4466c04f3d 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -72,6 +72,7 @@ static const AVCodecTag mp_bmp_tags[] = {
     { CODEC_ID_IDCIN,             MKTAG('I', 'D', 'C', 'I')},
     { CODEC_ID_INTERPLAY_VIDEO,   MKTAG('I', 'N', 'P', 'V')},
     { CODEC_ID_MDEC,              MKTAG('M', 'D', 'E', 'C')},
+    { CODEC_ID_MOTIONPIXELS,      MKTAG('M', 'V', 'I', '1')},
     { CODEC_ID_RL2,               MKTAG('R', 'L', '2', 'V')},
     { CODEC_ID_ROQ,               MKTAG('R', 'o', 'Q', 'V')},
     { CODEC_ID_THP,               MKTAG('T', 'H', 'P', 'V')},