diff --git a/src/Makefile.am b/src/Makefile.am
index c3909da7..fa09440f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,6 @@
-SUBDIRS = dec enc dsp utils
+# The mux and demux libraries depend on libwebp, thus the '.' to force the
+# build order so it's available to them.
+SUBDIRS = dec enc dsp utils .
 if WANT_MUX
   SUBDIRS += mux
 endif
diff --git a/src/demux/Makefile.am b/src/demux/Makefile.am
index f070808b..23d2e5db 100644
--- a/src/demux/Makefile.am
+++ b/src/demux/Makefile.am
@@ -8,5 +8,6 @@ libwebpdemuxinclude_HEADERS =
 libwebpdemuxinclude_HEADERS += ../webp/demux.h
 libwebpdemuxinclude_HEADERS += ../webp/types.h
 
-libwebpdemux_la_LDFLAGS = -version-info 0:0:0
+libwebpdemux_la_LIBADD = ../libwebp.la
+libwebpdemux_la_LDFLAGS = -no-undefined -version-info 0:0:0
 libwebpdemuxincludedir = $(includedir)/webp
diff --git a/src/mux/Makefile.am b/src/mux/Makefile.am
index bc07f7a6..87f43ca2 100644
--- a/src/mux/Makefile.am
+++ b/src/mux/Makefile.am
@@ -11,5 +11,6 @@ libwebpmuxinclude_HEADERS =
 libwebpmuxinclude_HEADERS += ../webp/mux.h
 libwebpmuxinclude_HEADERS += ../webp/types.h
 
-libwebpmux_la_LDFLAGS = -version-info 0:0:0
+libwebpmux_la_LIBADD = ../libwebp.la
+libwebpmux_la_LDFLAGS = -no-undefined -version-info 0:0:0
 libwebpmuxincludedir = $(includedir)/webp