diff --git a/Changelog b/Changelog
index 441ae1a204de72878e65d38bf5f4a11ac2a9e701..3249c60c5e79e8828f33a5ac69f1333c18f4b660 100644
--- a/Changelog
+++ b/Changelog
@@ -109,6 +109,7 @@ version <next>
 - Sun Rasterfile decoder
 - TechnoTrend PVA demuxer
 - Linux Media Labs MPEG-4 (LMLM4) demuxer
+- AVM2 (Flash 9) SWF muxer
 
 version 0.4.9-pre1:
 
diff --git a/doc/general.texi b/doc/general.texi
index 86f00f56dc6532dfbaa5c21ff3580a99ca86a3a8..899f426f9179f8e7655c7415285c32051a0186ca 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -52,6 +52,7 @@ library:
 @item AVI@tab X @tab X
 @item WAV@tab X @tab X
 @item Macromedia Flash@tab X @tab X
+@item AVM2 (Flash 9) @tab X @tab X
 @tab Only embedded audio is decoded.
 @item FLV              @tab  X @tab X
 @tab Macromedia Flash video files