diff --git a/Changelog b/Changelog
index 2e99fa4bd6..8b7efb6105 100644
--- a/Changelog
+++ b/Changelog
@@ -73,6 +73,7 @@ version <next>:
 - floating-point AC-3 encoder added
 - Lagarith decoder
 - ffmpeg -copytb option added
+- IVF muxer added
 
 
 version 0.6:
diff --git a/doc/general.texi b/doc/general.texi
index cbdc67909c..c1fecef580 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -110,7 +110,7 @@ library:
     @tab Format used in various Interplay computer games.
 @item IV8                       @tab   @tab X
     @tab A format generated by IndigoVision 8000 video server.
-@item IVF (On2)                 @tab   @tab X
+@item IVF (On2)                 @tab X @tab X
     @tab A format used by libvpx
 @item LMLM4                     @tab   @tab X
     @tab Used by Linux Media Labs MPEG-4 PCI boards
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 67462c40fe..d3c849ab69 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -109,6 +109,7 @@ OBJS-$(CONFIG_IPMOVIE_DEMUXER)           += ipmovie.o
 OBJS-$(CONFIG_ISS_DEMUXER)               += iss.o
 OBJS-$(CONFIG_IV8_DEMUXER)               += iv8.o
 OBJS-$(CONFIG_IVF_DEMUXER)               += ivfdec.o riff.o
+OBJS-$(CONFIG_IVF_MUXER)                 += ivfenc.o
 OBJS-$(CONFIG_LMLM4_DEMUXER)             += lmlm4.o
 OBJS-$(CONFIG_LXF_DEMUXER)               += lxfdec.o
 OBJS-$(CONFIG_M4V_DEMUXER)               += m4vdec.o rawdec.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index d543ad10e1..5fa97efa0b 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -109,7 +109,7 @@ void av_register_all(void)
     REGISTER_MUXER    (IPOD, ipod);
     REGISTER_DEMUXER  (ISS, iss);
     REGISTER_DEMUXER  (IV8, iv8);
-    REGISTER_DEMUXER  (IVF, ivf);
+    REGISTER_MUXDEMUX (IVF, ivf);
     REGISTER_DEMUXER  (LMLM4, lmlm4);
     REGISTER_DEMUXER  (LXF, lxf);
     REGISTER_MUXDEMUX (M4V, m4v);
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 919933ff68..b484649693 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -22,7 +22,7 @@
 #define AVFORMAT_AVFORMAT_H
 
 #define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 93
+#define LIBAVFORMAT_VERSION_MINOR 94
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \