diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 19e336bead..2f36801bcb 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -76,6 +76,7 @@ const CodecTag codec_bmp_tags[] = {
     { CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') }, 
     { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') }, 
     { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') }, 
+    { CODEC_ID_WMV2, MKTAG('W', 'M', 'V', '2') }, 
     { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') }, 
     { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd') }, 
     { CODEC_ID_DVVIDEO, MKTAG('D', 'V', 'S', 'D') }, 
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 526a25690e..8f6b43cb94 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -7,12 +7,16 @@ dda0ba041aef50a5101884291c06d4d9 *./data/a-mpeg1.mpg
 8786aa956838234fe3e48d0ef8cbd46c *./data/out.yuv
 a0bec32a81f9a4cd174557a49cd26430 *./data/a-wmv1.avi
 7261e23fd8ad1de6efee022051b936be *./data/out.yuv
+2ab9e737f91c7eaa970cf894b4e7fce5 *./data/a-wmv2.avi
+7261e23fd8ad1de6efee022051b936be *./data/out.yuv
 82822fc90059bc16a3ec159019b38b18 *./data/a-h263.avi
 545df74e0aa443499600faedd10a7065 *./data/out.yuv
 c92f9396cce0978caf6b5e7074a5812d *./data/a-h263p.avi
 668ba3cb87859ca4d9a4269bad47b3f5 *./data/out.yuv
 d625bba8e06bed36d201657cf9503bd0 *./data/a-odivx.avi
 98bb113f0fa0d61fd3b0b1699ac6c69a *./data/out.yuv
+51150a51ef6ee61f82009c393a723a47 *./data/a-huffyuv.avi
+799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
 9e1358a14c690c50ac98f3fd8ec4b75f *./data/a-mpeg4-rc.avi
 580000bfe2d4359d9aa9a9415f953b3b *./data/out.yuv
 6ef12f847b9a2a53c06ab05d69f0d255 *./data/a-mpeg4-adv.avi
diff --git a/tests/regression.sh b/tests/regression.sh
index 651a0d40a0..264a4620a5 100755
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -25,10 +25,11 @@ else
     do_msmpeg4v2=y
     do_msmpeg4=y
     do_wmv1=y
+    do_wmv2=y
     do_h263=y
     do_h263p=y
     do_mpeg4=y
-#    do_huffyuv=y
+    do_huffyuv=y
     do_mjpeg=y
     do_rv10=y
     do_mp2=y
@@ -120,6 +121,16 @@ do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an -vcodec wmv1 $file
 do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst 
 fi
 
+###################################
+if [ -n "$do_wmv2" ] ; then
+# wmv2 encoding
+file=${outfile}wmv2.avi
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an -vcodec wmv2 $file
+
+# wmv2 decoding
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst 
+fi
+
 ###################################
 if [ -n "$do_h263" ] ; then
 # h263 encoding