diff --git a/configure.ac b/configure.ac
index 1a9514ca99..b76426ded9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1762,6 +1762,7 @@ then
 
   AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support)
 fi
+AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"])
 
 AC_ARG_ENABLE(switcher,
   [  --enable-switcher       Stream-out switcher plugin (default disabled)])
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 9a19d31306..4289188447 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -11,14 +11,20 @@ SUBDIRS = \
 	gui \
 	meta_engine \
 	misc \
-	mux \
 	packetizer \
 	services_discovery \
-	stream_out \
 	video_chroma \
 	video_filter \
 	video_output \
 	visualization
+EXTRA_SUBDIRS = \
+	mux \
+	stream_out
+if ENABLE_SOUT
+SUBDIRS += mux stream_out
+endif
+
+DIST_SUBDIRS = $(SUBDIRS) $(EXTRA_SUBDIRS)
 
 dist_noinst_SCRIPTS = genmf list.sh
 dist_noinst_DATA = LIST