diff --git a/aegisub/libmedia/Makefile b/aegisub/libmedia/Makefile
new file mode 100644
index 000000000..dbdb4cd81
--- /dev/null
+++ b/aegisub/libmedia/Makefile
@@ -0,0 +1,36 @@
+# $Id$
+include ../Makefile.inc
+
+
+LIB_SHARED = libmedia_aegisub-3.0.so
+LIB_SHARED_INSTALL = yes
+LIB_VERSION = 3
+
+CXXFLAGS = -Iinclude -I../libaegisub/include -I../src -I.. -DMAGI -fPIC -Wno-variadic-macros
+
+PRECOMPILED_HEADER_NAME = magi_pre.h
+magi_pre.h.gch: CXXFLAGS := $(CXXFLAGS)
+
+#######################
+# AUDIO / VIDEO SUPPORT
+#######################
+ifeq (yes, $(HAVE_PROVIDER_FFMPEGSOURCE))
+SRC_OPT += audio/ffms_audio.cpp common/ffms_common.cpp video/ffms_video.cpp
+common/ffms_common.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC)
+audio/ffms_audio.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC)
+video/ffms_video.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC)
+LDFLAGS_POST += $(LDFLAGS_FFMPEGSOURCE)
+endif
+
+
+SRC = \
+	common/video_frame.cpp \
+	$(SRC_OPT)
+
+HEADERS = \
+	*/*.h \
+	include/libmedia/*.h \
+
+
+include ../Makefile.target
+-include */*.d
diff --git a/aegisub/libmedia/audio/ffms_audio.cpp b/aegisub/libmedia/audio/ffms_audio.cpp
index 0c0b38c9e..e0688b843 100644
--- a/aegisub/libmedia/audio/ffms_audio.cpp
+++ b/aegisub/libmedia/audio/ffms_audio.cpp
@@ -25,7 +25,7 @@
 #endif
 
 #include "ffms_audio.h"
-#include "libaegisub/media.h"
+#include "libmedia/exception.h"
 
 namespace agi {
 	namespace ffms {
diff --git a/aegisub/libmedia/audio/ffms_audio.h b/aegisub/libmedia/audio/ffms_audio.h
index 8ad062a03..a9aea05e9 100644
--- a/aegisub/libmedia/audio/ffms_audio.h
+++ b/aegisub/libmedia/audio/ffms_audio.h
@@ -29,7 +29,7 @@
 #include <map>
 #endif
 
-#include "ffms_common.h"
+#include "../common/ffms_common.h"
 
 namespace agi {
 	namespace ffms {
diff --git a/aegisub/libmedia/common/video_frame.cpp b/aegisub/libmedia/common/video_frame.cpp
index 9665f14a8..c816b99b7 100644
--- a/aegisub/libmedia/common/video_frame.cpp
+++ b/aegisub/libmedia/common/video_frame.cpp
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "libaegisub/media_video_frame.h"
+#include "libmedia/video_frame.h"
 
 #ifndef LAGI_PRE
 #include <assert.h>
diff --git a/aegisub/libmedia/video/ffms_video.cpp b/aegisub/libmedia/video/ffms_video.cpp
index cfdcfbff0..f2b5e160f 100644
--- a/aegisub/libmedia/video/ffms_video.cpp
+++ b/aegisub/libmedia/video/ffms_video.cpp
@@ -35,7 +35,7 @@
 #endif
 
 #include "ffms_video.h"
-#include "libaegisub/media.h"
+#include "libmedia/exception.h"
 #include "libaegisub/util.h"
 
 //#include "aegisub_endian.h"
diff --git a/aegisub/libmedia/video/ffms_video.h b/aegisub/libmedia/video/ffms_video.h
index 5eafdeb01..383e11b2a 100644
--- a/aegisub/libmedia/video/ffms_video.h
+++ b/aegisub/libmedia/video/ffms_video.h
@@ -25,10 +25,10 @@
 //#include "ffmpegsource_common.h"
 //#include "include/aegisub/video_provider.h"
 #include "../../libffms/include/ffms.h"
-#include "libaegisub/media_video_frame.h"
+#include "libmedia/video_frame.h"
 #include "libaegisub/vfr.h"
 #include "libaegisub/exception.h"
-#include "ffms_common.h"
+#include "../common/ffms_common.h"
 
 namespace agi {
 	namespace ffms {