diff --git a/Android.mk b/Android.mk
index c36c9574..eabec760 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,10 +35,6 @@ LOCAL_SRC_FILES := \
     src/enc/syntax.c \
     src/enc/tree.c \
     src/enc/webpenc.c \
-    src/mux/demux.c \
-    src/mux/muxedit.c \
-    src/mux/muxinternal.c \
-    src/mux/muxread.c \
     src/utils/bit_reader.c \
     src/utils/bit_writer.c \
     src/utils/color_cache.c \
diff --git a/Makefile.vc b/Makefile.vc
index 34b777d9..9e820c43 100644
--- a/Makefile.vc
+++ b/Makefile.vc
@@ -203,13 +203,14 @@ UTILS_OBJS = \
 LIBWEBP_OBJS = $(DEC_OBJS) $(DSP_OBJS) $(ENC_OBJS) $(UTILS_OBJS) $(LIBWEBP_OBJS)
 LIBWEBPMUX_OBJS = $(MUX_OBJS) $(LIBWEBPMUX_OBJS)
 
-OUT_LIBS = $(LIBWEBP) $(LIBWEBPMUX)
-OUT_EXAMPLES = $(DIRBIN)\cwebp.exe $(DIRBIN)\dwebp.exe $(DIRBIN)\webpmux.exe
+OUT_LIBS = $(LIBWEBP)
+OUT_EXAMPLES = $(DIRBIN)\cwebp.exe $(DIRBIN)\dwebp.exe
 
 all: $(OUT_LIBS) $(OUT_EXAMPLES)
 $(DIRBIN)\cwebp.exe: $(DIROBJ)\examples\cwebp.obj
 $(DIRBIN)\dwebp.exe: $(DIROBJ)\examples\dwebp.obj
 $(DIRBIN)\webpmux.exe: $(DIROBJ)\examples\webpmux.obj $(LIBWEBPMUX)
+$(DIRBIN)\webpmux.exe: $(EX_UTIL_OBJS) $(LIBWEBP)
 $(OUT_EXAMPLES): $(EX_UTIL_OBJS) $(LIBWEBP)
 
 experimental:
diff --git a/configure.ac b/configure.ac
index f69ce6da..74228b0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,6 +209,14 @@ fi
 AC_MSG_RESULT(${enable_experimental-no})
 AC_SUBST(USE_EXPERIMENTAL_CODE)
 
+dnl === Check whether libwebpmux should be built
+AC_MSG_CHECKING(whether libwebpmux is to be built)
+AC_ARG_ENABLE([experimental-libwebpmux],
+              AS_HELP_STRING([--enable-experimental-libwebpmux],
+                             [Build libwebpmux @<:@default=no@:>@]))
+AC_MSG_RESULT(${enable_experimental_libwebpmux-no})
+AM_CONDITIONAL([WANT_MUX], [test "$enable_experimental_libwebpmux" = "yes"])
+
 dnl =========================
 
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8d3e8b21..9324f0ea 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
-bin_PROGRAMS = dwebp cwebp webpmux
+bin_PROGRAMS = dwebp cwebp
+if WANT_MUX
+  bin_PROGRAMS += webpmux
+endif
 noinst_LTLIBRARIES = libexampleutil.la
 
 libexampleutil_la_SOURCES = example_util.c
diff --git a/makefile.unix b/makefile.unix
index 3c109ac9..777983b1 100644
--- a/makefile.unix
+++ b/makefile.unix
@@ -159,10 +159,13 @@ HDRS = \
     src/webp/mux.h \
     src/webp/types.h \
 
-OUT_LIBS = examples/libexample_util.a src/libwebp.a src/mux/libwebpmux.a
-OUT_EXAMPLES = examples/cwebp examples/dwebp examples/webpmux
+OUT_LIBS = examples/libexample_util.a src/libwebp.a
+OUT_EXAMPLES = examples/cwebp examples/dwebp
 
-OUTPUT = $(OUT_LIBS) $(OUT_EXAMPLES) examples/vwebp
+OUTPUT = $(OUT_LIBS) $(OUT_EXAMPLES)
+ifeq ($(MAKECMDGOALS),clean)
+  OUTPUT += examples/vwebp examples/webpmux src/mux/libwebpmux.a
+endif
 
 all: ex
 
diff --git a/man/Makefile.am b/man/Makefile.am
index 7440345b..bd243f30 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,2 +1,5 @@
-man_MANS = cwebp.1 dwebp.1 webpmux.1
+man_MANS = cwebp.1 dwebp.1
+if WANT_MUX
+  man_MANS += webpmux.1
+endif
 EXTRA_DIST = $(man_MANS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 42ab37dc..1da5ae9a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS = dec enc dsp utils mux
+SUBDIRS = dec enc dsp utils
+if WANT_MUX
+  SUBDIRS += mux
+endif
 
 AM_CPPFLAGS = -I$(top_srcdir)/src
 lib_LTLIBRARIES = libwebp.la