diff --git a/aegisub/setup.cpp b/aegisub/setup.cpp
index 483ec6bad..e87225661 100644
--- a/aegisub/setup.cpp
+++ b/aegisub/setup.cpp
@@ -123,6 +123,13 @@
 #pragma comment(lib, "opengl32.lib")
 
 
+////////////////
+// FFMpegSource
+#ifdef WITH_FFMPEGSOURCE
+#pragma comment(lib, "ffmpegsource2.lib")
+#endif
+
+
 //////////////
 // DirectShow
 #ifdef WITH_DIRECTSHOW
diff --git a/aegisub/video_provider_ffmpegsource.cpp b/aegisub/video_provider_ffmpegsource.cpp
index 24064541f..bede4afb8 100644
--- a/aegisub/video_provider_ffmpegsource.cpp
+++ b/aegisub/video_provider_ffmpegsource.cpp
@@ -38,7 +38,7 @@
 ///////////
 // Headers
 #include "video_provider_ffmpegsource.h"
-#include <ffms.h>
+#include "../FFmpegSource2/ffms.h"
 #include "video_context.h"
 #include "options.h"
 
@@ -230,7 +230,7 @@ const AegiVideoFrame FFmpegSourceVideoProvider::GetFrame(int _n, int FormatType)
 
 	// choose output format
 	if (FormatType & FORMAT_RGB32) {
-		DstFormat		= FFMS_PIX_FMT_RGB32; // FIXME: should be RGB32
+		DstFormat		= FFMS_PIX_FMT_RGB32;
 		DstFrame.format	= FORMAT_RGB32;
 	} else if (FormatType & FORMAT_RGB24) {
 		DstFormat		= FFMS_PIX_FMT_RGB24;
diff --git a/aegisub/video_provider_ffmpegsource.h b/aegisub/video_provider_ffmpegsource.h
index 4b5dd9d5e..452b196fe 100644
--- a/aegisub/video_provider_ffmpegsource.h
+++ b/aegisub/video_provider_ffmpegsource.h
@@ -42,7 +42,7 @@
 #include "dialog_progress.h"
 #include "vfr.h"
 #include <vector>
-#include <ffms.h>
+#include "../FFmpegSource2/ffms.h"
 
 
 
diff --git a/assdraw/assdraw_2008.vcproj b/assdraw/assdraw_2008.vcproj
index aa28473c8..9f5c5083f 100644
--- a/assdraw/assdraw_2008.vcproj
+++ b/assdraw/assdraw_2008.vcproj
@@ -199,7 +199,7 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="0"
 			/>
 			<Tool
diff --git a/build/aegisub_vs2008/aegisub_vs2008.vcproj b/build/aegisub_vs2008/aegisub_vs2008.vcproj
index afaf94482..29b482318 100644
--- a/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/build/aegisub_vs2008/aegisub_vs2008.vcproj
@@ -1644,6 +1644,14 @@
 				RelativePath="..\..\aegisub\video_provider_dummy.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\aegisub\video_provider_ffmpegsource.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\aegisub\video_provider_ffmpegsource.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\aegisub\video_provider_lavc.cpp"
 				>
diff --git a/lib/ffmpegsource2.lib b/lib/ffmpegsource2.lib
new file mode 100644
index 000000000..89023a32b
Binary files /dev/null and b/lib/ffmpegsource2.lib differ