diff --git a/Changelog b/Changelog
index 275c2e350b..ef3a80b6a7 100644
--- a/Changelog
+++ b/Changelog
@@ -84,6 +84,7 @@ MPlayer (1.0)
     * Matroska muxer
     * Monkey's Audio demuxer and decoder
     * Flac encoder and decoder speedups
+    * AMV demuxer and audio/video decoder
 
     libmpeg2:
     * iWMMXt-accelerated DCT and motion compensation for ARM processors
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 92a0b7debf..1f97a3fe13 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3,7 +3,7 @@
 ;  Before editing this file, please read DOCS/tech/codecs.conf.txt !
 ;=============================================================================
 
-release 20070511
+release 20070930
 
 ;=============================================================================
 ;                   VIDEO CODECS
@@ -1598,6 +1598,14 @@ videocodec tm20
   guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84
   out BGR32,BGR24,BGR16 flip
 
+videocodec ffamv
+  info "Modified MJPEG, used in AMV files"
+  status working
+  fourcc AMVV  ; internal MPlayer FourCC
+  driver ffmpeg
+  dll "amv"
+  out YV12
+
 videocodec ffsp5x
   info "SP5x codec - used by Aiptek MegaCam"
   status working
@@ -2564,6 +2572,13 @@ audiocodec raatrcmac
   driver realaud
   dll "atrc.bundle/Contents/MacOS/atrc"
 
+audiocodec ffadpcmimaamv
+  info "FFmpeg AMV IMA ADPCM audio"
+  status working
+  format 0x01
+  driver ffmpeg
+  dll adpcm_ima_amv
+
 audiocodec imaadpcm
   info "IMA ADPCM"
   status working
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index eff31274ff..7f54d93812 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -99,6 +99,7 @@ static const AVCodecTag mp_wav_tags[] = {
 const struct AVCodecTag *mp_wav_taglists[] = {codec_wav_tags, mp_wav_tags, 0};
 
 static const AVCodecTag mp_bmp_tags[] = {
+    { CODEC_ID_AMV,               MKTAG('A', 'M', 'V', 'V')},
     { CODEC_ID_BETHSOFTVID,       MKTAG('B', 'E', 'T', 'H')},
     { CODEC_ID_C93,               MKTAG('C', '9', '3', 'V')},
     { CODEC_ID_DSICINVIDEO,       MKTAG('D', 'C', 'I', 'V')},