diff --git a/aegisub/libaegisub/Makefile b/aegisub/libaegisub/Makefile
index d9fd5e251..4c381604b 100644
--- a/aegisub/libaegisub/Makefile
+++ b/aegisub/libaegisub/Makefile
@@ -17,9 +17,19 @@ LDFLAGS += -L../universalchardet -luniversalchardet
 endif
 
 common/charset_conv.o: CXXFLAGS += $(CFLAGS_ICONV)
+
+#######################
+# AUDIO / VIDEO SUPPORT
+#######################
+ifeq (yes, $(HAVE_PROVIDER_FFMPEGSOURCE))
+SRC_OPT += media/ffms_audio.cpp media/ffms_common.cpp media/ffms_video.cpp
 common/ffms.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC)
 common/ffms_audio.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC)
 common/ffms_video.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC)
+#LDFLAGS += $(LDFLAGS_FFMPEGSOURCE) $(LDFLAGS_LIBAVFORMAT) $(LDFLAGS_LIBAVCODEC) $(LDFLAGS_LIBSWSCALE) $(LDFLAGS_LIBAVUTIL) $(LDFLAGS_LIBPOSTPROC)
+LDFLAGS_POST += $(LDFLAGS_FFMPEGSOURCE)
+endif
+
 
 SRC = \
 	common/charset.cpp \
@@ -34,14 +44,12 @@ SRC = \
 	common/log.cpp \
 	common/validator.cpp \
 	common/vfr.cpp \
-	media/ffms_audio.cpp \
-	media/ffms_common.cpp \
-	media/ffms_video.cpp \
 	media/video_frame.cpp \
 	unix/util.cpp \
 	unix/io.cpp \
 	unix/access.cpp \
-	unix/log.cpp
+	unix/log.cpp \
+	$(SRC_OPT)
 
 ifeq (yes, $(BUILD_DARWIN))
 SRC += \