diff --git a/etc/codecs.conf b/etc/codecs.conf
index 5a31a2f32b..1e7b3e0fe8 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -459,6 +459,7 @@ videocodec ffsvq3
 videocodec ffodivx
   info "FFmpeg MPEG-4"
   status working
+  fourcc FMP4,fmp4
   fourcc DIVX,divx
   fourcc DIV1,div1 divx
   fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index a38968a98a..34952cff47 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -990,7 +990,7 @@ static int vf_open(vf_instance_t *vf, char* args){
     else if (!strcasecmp(lavc_param_vcodec, "ljpeg"))
 	mux_v->bih->biCompression = mmioFOURCC('L', 'J', 'P', 'G');
     else if (!strcasecmp(lavc_param_vcodec, "mpeg4"))
-	mux_v->bih->biCompression = mmioFOURCC('D', 'I', 'V', 'X');
+	mux_v->bih->biCompression = mmioFOURCC('F', 'M', 'P', '4');
     else if (!strcasecmp(lavc_param_vcodec, "msmpeg4"))
 	mux_v->bih->biCompression = mmioFOURCC('d', 'i', 'v', '3');
     else if (!strcasecmp(lavc_param_vcodec, "msmpeg4v2"))
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c
index 32222faa24..d8a9691932 100644
--- a/libmpdemux/aviheader.c
+++ b/libmpdemux/aviheader.c
@@ -289,6 +289,8 @@ while(1){
         case mmioFOURCC('D', 'X', '5', '0'):
         case mmioFOURCC('X', 'V', 'I', 'D'):
         case mmioFOURCC('x', 'v', 'i', 'd'):
+        case mmioFOURCC('F', 'M', 'P', '4'):
+        case mmioFOURCC('f', 'm', 'p', '4'):
           idxfix_divx=2; // set index recovery mpeg4 flavour: generic mpeg4
 	  mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for MPEG4 video\n");
 	  break;