diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 066c97d8c6..155c29734f 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -21,7 +21,6 @@ SRCS  = asfheader.c \
         demux_mf.c \
         demux_mkv.c ebml.c \
         demux_mov.c \
-        demux_mpc.c \
         demux_mpg.c \
         demux_nsv.c \
         demux_nuv.c \
@@ -55,6 +54,7 @@ SRCS-$(GIF)                     += demux_gif.c
 SRCS-$(LIBDV)                   += demux_rawdv.c
 SRCS-$(LIBNUT)                  += demux_nut.c
 SRCS-$(LIBVORBIS)               += demux_ogg.c
+SRCS-$(MUSEPACK)                += demux_mpc.c
 SRCS-$(STREAMING_LIVE555)       += demux_rtp.cpp demux_rtp_codec.cpp
 SRCS-$(WIN32DLL)                += demux_avs.c
 SRCS-$(XMMS_PLUGINS)            += demux_xmms.c
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index e5dd39c25b..1b97879551 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -106,7 +106,9 @@ demuxer_desc_t* demuxer_list[] = {
   &demuxer_desc_mpeg_gxf,
   &demuxer_desc_mpeg4_es,
   &demuxer_desc_h264_es,
+#ifdef MUSEPACK
   &demuxer_desc_mpc,
+#endif
   &demuxer_desc_audio,
   &demuxer_desc_mpeg_ty,
 #ifdef STREAMING_LIVE555