diff --git a/build/Aegisub/Aegisub.targets b/build/Aegisub/Aegisub.targets
index 0dcbfb264..46cc90c9f 100644
--- a/build/Aegisub/Aegisub.targets
+++ b/build/Aegisub/Aegisub.targets
@@ -79,7 +79,7 @@
- WITH_FFMS2;%(PreprocessorDefinitions)
+ WITH_FFMS2;FFMS_STATIC;%(PreprocessorDefinitions)
diff --git a/build/PortableInstaller/PortableInstaller.vcxproj b/build/PortableInstaller/PortableInstaller.vcxproj
index 5c828c4b1..e6f5f8003 100644
--- a/build/PortableInstaller/PortableInstaller.vcxproj
+++ b/build/PortableInstaller/PortableInstaller.vcxproj
@@ -131,7 +131,6 @@
csri\
-
diff --git a/build/PortableInstaller/PortableInstaller.vcxproj.filters b/build/PortableInstaller/PortableInstaller.vcxproj.filters
index cee9892a4..14d7d29a6 100644
--- a/build/PortableInstaller/PortableInstaller.vcxproj.filters
+++ b/build/PortableInstaller/PortableInstaller.vcxproj.filters
@@ -101,7 +101,6 @@
Automation\Include
-
Runtime
diff --git a/build/ffms2/ffms2.vcxproj b/build/ffms2/ffms2.vcxproj
index f366334ea..cb0d0bff7 100644
--- a/build/ffms2/ffms2.vcxproj
+++ b/build/ffms2/ffms2.vcxproj
@@ -7,7 +7,7 @@
- dll
+ lib
@@ -24,6 +24,7 @@
WITH_SWRESAMPLE;
FFMS_EXPORTS;
+ FFMS_STATIC;
_CRT_SECURE_NO_WARNINGS;
_CRT_NONSTDC_NO_DEPRECATE;
_SCL_SECURE_NO_WARNINGS;
diff --git a/packages/win_installer/fragment_codecs_32.iss b/packages/win_installer/fragment_codecs_32.iss
index 97970f4ce..06839e47c 100644
--- a/packages/win_installer/fragment_codecs_32.iss
+++ b/packages/win_installer/fragment_codecs_32.iss
@@ -38,8 +38,6 @@
DestDir: {app}; Source: src\devil.dll; Flags: ignoreversion
DestDir: {app}; Source: src\avisynth.dll; Flags: ignoreversion
DestDir: {app}; Source: src\DirectShowSource.dll; Flags: ignoreversion
-; ffmpegsource
-DestDir: {app}; Source: ..\..\bin\ffms2_32.dll; Flags: ignoreversion
; vsfilter
DestDir: {app}\csri; Source: ..\..\bin\csri\xy-vsfilter-aegisub32.dll; Flags: ignoreversion
diff --git a/packages/win_installer/fragment_codecs_64.iss b/packages/win_installer/fragment_codecs_64.iss
index d413c3212..df1ff6ffa 100644
--- a/packages/win_installer/fragment_codecs_64.iss
+++ b/packages/win_installer/fragment_codecs_64.iss
@@ -34,8 +34,6 @@
[Files]
-; ffmpegsource
-DestDir: {app}; Source: ..\..\bin\ffms2_64.dll; Flags: ignoreversion
; vsfilter
DestDir: {app}\csri; Source: ..\..\bin\csri\xy-vsfilter-aegisub64.dll; Flags: ignoreversion
diff --git a/vendor/ffms2 b/vendor/ffms2
index 7477df004..06bcf231c 160000
--- a/vendor/ffms2
+++ b/vendor/ffms2
@@ -1 +1 @@
-Subproject commit 7477df0044bdaa9c869c1c42ef40c5d2b83e6469
+Subproject commit 06bcf231cab00bfbf28f910c6ec3ca6680957cb6