diff --git a/configure.ac b/configure.ac
index 3dd2f62cb800d8acca381bcaa73f30a570ee4b8d..73ec183da97136bc982f72746c3f7fbbbf39c857 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5879,6 +5879,7 @@ AC_CONFIG_FILES([
   modules/control/http/Makefile
   modules/demux/Makefile
   modules/demux/asf/Makefile
+  modules/demux/avformat/Makefile
   modules/demux/avi/Makefile
   modules/demux/mp4/Makefile
   modules/demux/mpeg/Makefile
diff --git a/modules/codec/ffmpeg/Modules.am b/modules/codec/ffmpeg/Modules.am
index ca7890239a98740aaea3afb1c727f12c4713bcfe..bdb15ebc9fa136d07477bbe78df8a4af00df15c7 100644
--- a/modules/codec/ffmpeg/Modules.am
+++ b/modules/codec/ffmpeg/Modules.am
@@ -17,23 +17,6 @@ EXTRA_libavcodec_plugin_la_SOURCES = \
 	encoder.c \
 	$(NULL)
 
-SOURCES_avformat = \
-	avformat.c \
-	avformat.h \
-	demux.c \
-	avutil.h \
-	fourcc.h \
-	chroma.h \
-	$(NULL)
-
-if ENABLE_SOUT
-SOURCES_avformat += mux.c
-endif
-
-EXTRA_libavformat_plugin_la_SOURCES = \
-	mux.c \
-	$(NULL)
-
 SOURCES_imgresample = \
 	imgresample.c \
 	imgresample.h \
@@ -44,12 +27,10 @@ SOURCES_imgresample = \
 
 libvlc_LTLIBRARIES += \
 	$(LTLIBavcodec) \
-	$(LTLIBavformat) \
 	$(LTLIBimgresample)
 
 EXTRA_LTLIBRARIES += \
 	libavcodec_plugin.la \
-	libavformat_plugin.la \
 	libimgresample_plugin.la
 
 # FIXME SOURCES_ffmpegaltivec = \
diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index cd4677e814ea48b0d1800291d5ca9f986f55097a..d934cd0c83839d2ab4bc86b5349fe2043566f0e4 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = asf avi mp4 mpeg playlist
+SUBDIRS = asf avformat avi mp4 mpeg playlist
 SOURCES_a52sys = a52.c
 SOURCES_dtssys = dts.c
 SOURCES_flacsys = flac.c
diff --git a/modules/codec/ffmpeg/avformat.c b/modules/demux/avformat/avformat.c
similarity index 100%
rename from modules/codec/ffmpeg/avformat.c
rename to modules/demux/avformat/avformat.c
diff --git a/modules/codec/ffmpeg/avformat.h b/modules/demux/avformat/avformat.h
similarity index 100%
rename from modules/codec/ffmpeg/avformat.h
rename to modules/demux/avformat/avformat.h
diff --git a/modules/codec/ffmpeg/demux.c b/modules/demux/avformat/demux.c
similarity index 99%
rename from modules/codec/ffmpeg/demux.c
rename to modules/demux/avformat/demux.c
index 815e31be755df22eff039f7dd4abdf56502702cb..85711d01f5da567bc6298ee318b0e7a93e16df42 100644
--- a/modules/codec/ffmpeg/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -42,8 +42,8 @@
 #   include <ffmpeg/avformat.h>
 #endif
 
-#include "fourcc.h"
-#include "chroma.h"
+#include "../../codec/ffmpeg/fourcc.h"
+#include "../../codec/ffmpeg/chroma.h"
 
 //#define AVFORMAT_DEBUG 1
 
diff --git a/modules/codec/ffmpeg/mux.c b/modules/demux/avformat/mux.c
similarity index 99%
rename from modules/codec/ffmpeg/mux.c
rename to modules/demux/avformat/mux.c
index a8b783591a0378b5bd7f22e354c8ddfc0b883d04..f3fc73b10b717259b43b1104dc2949545efe9ea2 100644
--- a/modules/codec/ffmpeg/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -41,8 +41,8 @@
 #endif
 
 #include "avformat.h"
-#include "fourcc.h"
-#include "avutil.h"
+#include "../../codec/ffmpeg/fourcc.h"
+#include "../../codec/ffmpeg/avutil.h"
 
 //#define AVFORMAT_DEBUG 1