diff --git a/aegisub/build/Aegisub/Aegisub.targets b/aegisub/build/Aegisub/Aegisub.targets
index fda47d959..96ee5205e 100644
--- a/aegisub/build/Aegisub/Aegisub.targets
+++ b/aegisub/build/Aegisub/Aegisub.targets
@@ -89,6 +89,9 @@
     <ClCompile>
       <PreprocessorDefinitions>WITH_LIBASS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <Link>
+      <AdditionalDependencies>fribidi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
   </ItemDefinitionGroup>
 
   <!-- Freetype 2 support -->
@@ -176,9 +179,9 @@
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
     </ClCompile>
-		<Link>
-			<AdditionalLibraryDirectories>$(AegisubLibraryDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-		</Link>
+    <Link>
+      <AdditionalLibraryDirectories>$(AegisubLibraryDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
   </ItemDefinitionGroup>
 
   <!-- Add property pages -->
diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj b/aegisub/build/Aegisub/Aegisub.vcxproj
index 8e36f6b5e..c657f6b58 100644
--- a/aegisub/build/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/Aegisub/Aegisub.vcxproj
@@ -68,6 +68,9 @@
     <ProjectReference Include="..\fontconfig\fontconfig.vcxproj" Condition="Exists('$(FontconfigSrcDir)')">
       <Project>{ad56899e-961b-47b7-bd0f-14d0da50d141}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\fribidi\fribidi.vcxproj">
+      <Project>{fb8e8d19-a4d6-4181-943c-282075f49b41}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\hunspell\hunspell.vcxproj">
       <Project>{cc791693-6b28-40ac-879d-64a6c16468e3}</Project>
     </ProjectReference>
diff --git a/aegisub/build/fribidi/fribidi.vcxproj b/aegisub/build/fribidi/fribidi.vcxproj
index 9575337a4..c915a4264 100644
--- a/aegisub/build/fribidi/fribidi.vcxproj
+++ b/aegisub/build/fribidi/fribidi.vcxproj
@@ -32,14 +32,15 @@
   </ImportGroup>
 
   <PropertyGroup Label="ConfigArgs">
-    <CfgDebug Condition="'$(Configuration)' == 'Debug'">--enable-debug CFLAGS=-MDd</CfgDebug>
-    <CfgDebug Condition="'$(Configuration)' == 'Release'">--disable-debug CFLAGS=-MD</CfgDebug>
+    <Cflags>-nologo -DFRIBIDI_ENTRY=\"\"</Cflags>
+    <CfgDebug Condition="'$(Configuration)' == 'Debug'">--enable-debug CFLAGS="-MDd $(Cflags)"</CfgDebug>
+    <CfgDebug Condition="'$(Configuration)' == 'Release'">--disable-debug CFLAGS="-MD $(Cflags)"</CfgDebug>
     <CfgArgs>
       --enable-static
       --disable-shared
       --disable-dependency-tracking
       --without-glib
-      $(CfgEnableDebug)
+      $(CfgDebug)
     </CfgArgs>
     <AbsSrcDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)$(FribidiSrcDir)'))</AbsSrcDir>
   </PropertyGroup>
diff --git a/aegisub/build/libass/libass.vcxproj b/aegisub/build/libass/libass.vcxproj
index 476a0c320..c3150fda1 100644
--- a/aegisub/build/libass/libass.vcxproj
+++ b/aegisub/build/libass/libass.vcxproj
@@ -45,6 +45,7 @@
       </AdditionalIncludeDirectories>
       <PreprocessorDefinitions>
         inline=__inline;
+        FRIBIDI_ENTRY=;
         %(PreprocessorDefinitions)
       </PreprocessorDefinitions>
     </ClCompile>