diff --git a/.gitmodules b/.gitmodules
index 2fe172de4..cf6315c60 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,7 +43,7 @@
 	ignore = dirty
 [submodule "deps/boost"]
 	path = deps/boost
-	url = git://github.com/alexanderkjeldaas/boost-mirror.git
+	url = https://github.com/boostorg/boost.git
 	ignore = dirty
 [submodule "deps/lua"]
 	path = deps/lua
diff --git a/aegisub/build/boost/boost.vcxproj b/aegisub/build/boost/boost.vcxproj
index 986ec1ccc..7af7d369b 100644
--- a/aegisub/build/boost/boost.vcxproj
+++ b/aegisub/build/boost/boost.vcxproj
@@ -32,6 +32,22 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
+  <Target Name="CopyHeaders" BeforeTargets="ClCompile">
+    <!-- All this cruft is to work around that despite what the documentation
+         claims, %(RecursiveDir) matches everything from the first * (not even
+         **) until the last / -->
+    <ItemGroup>
+      <BoostLibraries Include="$([System.IO.Directory]::GetDirectories(&quot;$(BoostPath)\libs&quot;))" />
+      <BoostIncludeDirs Include="%(BoostLibraries.Identity)\include\boost;$(BoostPath)\libs\numeric\conversion\include\boost" />
+      <Headers Include="%(BoostIncludeDirs.Identity)\**\*.*" />
+   </ItemGroup>
+    <Copy
+      SourceFiles="@(Headers)"
+      DestinationFiles="@(Headers->'$(AegisubSourceBase)include\boost\%(RecursiveDir)%(Filename)%(Extension)')"
+      SkipUnchangedFiles="true"
+      />
+  </Target>
+
   <!-- Source files -->
   <ItemGroup>
     <ClCompile Include="$(BoostPath)\libs\regex\src\cpp_regex_traits.cpp" />
diff --git a/deps/boost b/deps/boost
index 1b626831e..dd8bda57e 160000
--- a/deps/boost
+++ b/deps/boost
@@ -1 +1 @@
-Subproject commit 1b626831ef9060f49b3197583e7f80445b19a862
+Subproject commit dd8bda57e82b7f11e3cbcf8bb7949986f8c262ab
diff --git a/deps/ffmpeg b/deps/ffmpeg
index ee189701a..76d8d2388 160000
--- a/deps/ffmpeg
+++ b/deps/ffmpeg
@@ -1 +1 @@
-Subproject commit ee189701a6f7fec56570ee3728d5d80378cbadd3
+Subproject commit 76d8d2388120910b46225299b3e10fb4dd18287f