diff --git a/aegisub/build/Aegisub/Aegisub.targets b/aegisub/build/Aegisub/Aegisub.targets
index a17be1fc3..3184551be 100644
--- a/aegisub/build/Aegisub/Aegisub.targets
+++ b/aegisub/build/Aegisub/Aegisub.targets
@@ -100,12 +100,7 @@
   <ItemDefinitionGroup Condition="'$(AegisubUseFreetype2)'=='true'">
     <ClCompile>
       <PreprocessorDefinitions>WITH_FREETYPE2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Ft2IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(Ft2LibraryPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Ft2LibraryName);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
 
   <!-- FFmpegSource support -->
diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj b/aegisub/build/Aegisub/Aegisub.vcxproj
index b89675309..7dce522f1 100644
--- a/aegisub/build/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/Aegisub/Aegisub.vcxproj
@@ -66,6 +66,9 @@
     <ProjectReference Include="..\fftw\fftw.vcxproj" Condition="Exists('$(FftwSrcDir)')">
       <Project>{ea3dcc95-2423-4ea0-a508-7a427b4c0594}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\freetype2\freetype.vcxproj" Condition="Exists('$(Freetype2SrcDir)')">
+      <Project>{78b079bd-9fc7-4b9e-b4a6-96da0f00248b}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\hunspell\hunspell.vcxproj">
       <Project>{cc791693-6b28-40ac-879d-64a6c16468e3}</Project>
     </ProjectReference>
diff --git a/aegisub/build/Aegisub/Aegisub.xml b/aegisub/build/Aegisub/Aegisub.xml
index b592ad97f..ab74dcff3 100644
--- a/aegisub/build/Aegisub/Aegisub.xml
+++ b/aegisub/build/Aegisub/Aegisub.xml
@@ -122,27 +122,6 @@
     DisplayName="Use Freetype 2"
     Description="Specify whether to use Freetype 2 for font enumeration in the Font Collector. You will need to configure the location of the Freetype 2 library on the Library paths page."
     />
-  <StringProperty
-    Subtype="folder"
-    Name="Ft2IncludePath"
-    Category="Paths"
-    DisplayName="Freetype 2 include path"
-    Description="Location of Freetype 2 include files"
-    />
-  <StringProperty
-    Subtype="folder"
-    Name="Ft2LibraryPath"
-    Category="Paths"
-    DisplayName="Freetype 2 library path"
-    Description="Location of Freetype 2 library files"
-    />
-  <StringProperty
-    Subtype="file"
-    Name="Ft2LibraryName"
-    Category="Paths"
-    DisplayName="Freetype 2 library name"
-    Description="Name of Freetype 2 library"
-    />
 
   <BoolProperty
     Name="AegisubUseFftw"
diff --git a/aegisub/build/fftw/config.xml b/aegisub/build/fftw/config.xml
index e1070542d..0f253af86 100644
--- a/aegisub/build/fftw/config.xml
+++ b/aegisub/build/fftw/config.xml
@@ -12,6 +12,7 @@
   <StringProperty
     Subtype="folder"
     Name="FftwSrcDir"
-    DisplayName="A directory containing a copy of FFTW3, or empty to disable FFTW3. Changes to this property do not take effect until the project is reloaded."
+    DisplayName="Source Location"
+    Description="A directory containing a copy of FFTW3, or empty to disable FFTW3. Changes to this property do not take effect until the project is reloaded."
     />
 </Rule>
diff --git a/aegisub/build/freetype2/config.xml b/aegisub/build/freetype2/config.xml
new file mode 100644
index 000000000..ecf86812c
--- /dev/null
+++ b/aegisub/build/freetype2/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Rule Name="ExternalSourceLocation"
+    DisplayName="Source Location"
+    Order="1"
+    PageTemplate="tool"
+    xmlns="http://schemas.microsoft.com/build/2009/properties">
+
+  <Rule.DataSource>
+    <DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="false" />
+  </Rule.DataSource>
+
+  <StringProperty
+    Subtype="folder"
+    Name="Freetype2SrcDir"
+    DisplayName="Source Location"
+    Description="A directory containing a copy of FreeType2, or empty to disable FreeType2. Changes to this property do not take effect until the project is reloaded."
+    />
+</Rule>
diff --git a/aegisub/build/freetype2/freetype.vcxproj b/aegisub/build/freetype2/freetype.vcxproj
new file mode 100644
index 000000000..0032ea70e
--- /dev/null
+++ b/aegisub/build/freetype2/freetype.vcxproj
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- VC boilerplate -->
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}</ProjectGuid>
+    <RootNamespace>freetype</RootNamespace>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+
+  <!-- Project configuration -->
+  <ItemGroup>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)config.xml" />
+    <ProjectTools Include="ExternalSourceLocation" />
+  </ItemGroup>
+
+  <PropertyGroup Label="AegisubConfiguration">
+    <AegisubProjectType>lib</AegisubProjectType>
+  </PropertyGroup>
+
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
+  </ImportGroup>
+
+  <!-- Project specific configuration -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Freetype2SrcDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <DisableLanguageExtensions>true</DisableLanguageExtensions>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PostBuildEvent>
+      <Command>
+        md $(AegisubSourceBase)\include 2&gt; NUL
+        xcopy /s /q /y $(Freetype2SrcDir)\include $(AegisubSourceBase)\include
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+
+  <!-- Source files -->
+  <ItemGroup>
+    <ClCompile Include="$(Freetype2SrcDir)\builds\win32\ftdebug.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\autofit\autofit.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftbase.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftbbox.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftbitmap.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftfstype.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftgasp.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftglyph.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftgxval.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftinit.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftlcdfil.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftmm.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftotval.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftpatent.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftpfr.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftstroke.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftsynth.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftsystem.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\fttype1.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftwinfnt.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftxf86.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\bdf\bdf.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\cache\ftcache.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\cff\cff.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\cid\type1cid.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\gzip\ftgzip.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\lzw\ftlzw.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\pcf\pcf.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\pfr\pfr.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\psaux\psaux.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\pshinter\pshinter.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\psnames\psmodule.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\raster\raster.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\sfnt\sfnt.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\smooth\smooth.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\truetype\truetype.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\type1\type1.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\type42\type42.c" />
+    <ClCompile Include="$(Freetype2SrcDir)\src\winfonts\winfnt.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(Freetype2SrcDir)\include\ft2build.h" />
+    <ClInclude Include="$(Freetype2SrcDir)\include\freetype\config\ftconfig.h" />
+    <ClInclude Include="$(Freetype2SrcDir)\include\freetype\config\ftheader.h" />
+    <ClInclude Include="$(Freetype2SrcDir)\include\freetype\config\ftmodule.h" />
+    <ClInclude Include="$(Freetype2SrcDir)\include\freetype\config\ftoption.h" />
+    <ClInclude Include="$(Freetype2SrcDir)\include\freetype\config\ftstdlib.h" />
+  </ItemGroup>
+</Project>
diff --git a/aegisub/build/freetype2/freetype.vcxproj.filters b/aegisub/build/freetype2/freetype.vcxproj.filters
new file mode 100644
index 000000000..74967e6a0
--- /dev/null
+++ b/aegisub/build/freetype2/freetype.vcxproj.filters
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{b4c15893-ec11-491d-9507-0ac184f9cc78}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Source Files\FT_MODULES">
+      <UniqueIdentifier>{4d3e4eff-3fbc-4b20-b413-2743b23b7109}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{e6cf6a0f-0404-4024-8bf8-ff5b29f35657}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(Freetype2SrcDir)\builds\win32\ftdebug.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\autofit\autofit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftbase.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftbbox.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftbitmap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftfstype.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftgasp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftglyph.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftgxval.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftinit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftlcdfil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftmm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftotval.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftpatent.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftpfr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftstroke.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftsynth.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftsystem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\fttype1.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftwinfnt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\base\ftxf86.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\bdf\bdf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\cache\ftcache.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\cff\cff.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\cid\type1cid.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\gzip\ftgzip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\lzw\ftlzw.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\pcf\pcf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\pfr\pfr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\psaux\psaux.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\pshinter\pshinter.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\psnames\psmodule.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\raster\raster.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\sfnt\sfnt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\smooth\smooth.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\truetype\truetype.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\type1\type1.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\type42\type42.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(Freetype2SrcDir)\src\winfonts\winfnt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(Freetype2SrcDir)\include\ft2build.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(Freetype2SrcDir)\include\freetype\config\ftconfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(Freetype2SrcDir)\include\freetype\config\ftheader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(Freetype2SrcDir)\include\freetype\config\ftmodule.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(Freetype2SrcDir)\include\freetype\config\ftoption.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(Freetype2SrcDir)\include\freetype\config\ftstdlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file