diff --git a/NEWS b/NEWS
index 16f08e216..00972bab4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 ver 0.16.9 (2012/??/??)
+* decoder:
+  - ffmpeg: support WebM
 
 
 ver 0.16.8 (2012/04/04)
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 2929d316a..3bb3a07b6 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -745,7 +745,8 @@ static const char *const ffmpeg_suffixes[] = {
 	"ram", "rl2", "rm", "rmvb", "roq", "rpl", "rvc", "shn", "smk", "snd",
 	"sol", "son", "spx", "str", "swf", "tgi", "tgq", "tgv", "thp", "ts",
 	"tsp", "tta", "xa", "xvid", "uv", "uv2", "vb", "vid", "vob", "voc",
-	"vp6", "vmd", "wav", "wma", "wmv", "wsaud", "wsvga", "wv", "wve",
+	"vp6", "vmd", "wav", "webm", "wma", "wmv", "wsaud", "wsvga", "wv",
+	"wve",
 	NULL
 };
 
@@ -809,6 +810,7 @@ static const char *const ffmpeg_mime_types[] = {
 	"video/msvideo",
 	"video/ogg",
 	"video/theora",
+	"video/webm",
 	"video/x-dv",
 	"video/x-flv",
 	"video/x-matroska",