diff --git a/.gitmodules b/.gitmodules
index 9524e4fcf..8a729764c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "project/toolkit/ogg/ogg"]
 	path = project/toolkit/ogg/ogg
 	url = https://github.com/xiph/ogg.git
+[submodule "project/toolkit/freetype/freetype"]
+	path = project/toolkit/freetype/freetype
+	url = https://github.com/freetype/freetype.git
diff --git a/project/ToolkitBuild.xml b/project/ToolkitBuild.xml
index 55cb22f2d..066050875 100644
--- a/project/ToolkitBuild.xml
+++ b/project/ToolkitBuild.xml
@@ -139,6 +139,7 @@
       <include name="toolkit/jpeg/files.xml" />
       <include name="toolkit/ogg/files.xml" />
       <include name="toolkit/vorbis/files.xml" />
+      <include name="toolkit/freetype/files.xml" />
    </section>
 
    <section unless="NME_LOCAL_TOOLKIT">
@@ -152,11 +153,12 @@
       <include name="${NME_OGG}/files.xml" />
       <set name="NME_VORBIS" value="${NATIVE_TOOLKIT_PATH}/vorbis/" />
       <include name="${NME_VORBIS}/files.xml" />
+      <set name="NME_FREETYPE" value="${NATIVE_TOOLKIT_PATH}/freetype/" />
+      <include name="${NME_FREETYPE}files.xml" />
    </section>
 
 
    <include name="${NATIVE_TOOLKIT_PATH}/curl/files.xml" />
-   <include name="${NATIVE_TOOLKIT_PATH}/freetype/files.xml" />
    <include name="${NATIVE_TOOLKIT_PATH}/sdl/files.xml" />
    <include name="${NATIVE_TOOLKIT_PATH}/modplug/files.xml" if="modplug" />
    <include name="${NATIVE_TOOLKIT_PATH}/sdl-mixer/files.xml" if="NME_MIXER" />
@@ -344,10 +346,12 @@
       <compilerflag value="-I${NME_OGG}include"/>
       <compilerflag value="-I${NME_OGG}.." if="NME_LOCAL_TOOLKIT" />
 
-      <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/freetype"/>
-      <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/freetype/include"/>
-      <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/freetype/freetype/include"/>
-      <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/freetype/freetype/include/freetype"/>
+      <compilerflag value="-I${NME_FREETYPE}"/>
+      <compilerflag value="-I${NME_FREETYPE}include"/>
+      <compilerflag value="-I${NME_FREETYPE}freetype/include"/>
+      <compilerflag value="-I${NME_FREETYPE}freetype/include/freetype"/>
+      <compilerflag value="-I${NME_FREETYPE}include/freetype"/>
+
       <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/modplug" if="modplug" />
       <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/curl/include" if="NME_CURL" />
 
diff --git a/project/src/common/FreeType.cpp b/project/src/common/FreeType.cpp
index 79df54688..6a00a6d3b 100644
--- a/project/src/common/FreeType.cpp
+++ b/project/src/common/FreeType.cpp
@@ -19,8 +19,8 @@
 #include FT_TRUETYPE_IDS_H
 
 #ifdef NME_TOOLKIT_BUILD
-#include <ftoutln.h>
-#include <ftstroke.h>
+#include "ftoutln.h"
+#include "ftstroke.h"
 #else
 #include <freetype/ftoutln.h>
 #endif
diff --git a/project/toolkit/freetype/files.xml b/project/toolkit/freetype/files.xml
new file mode 100644
index 000000000..afd145b05
--- /dev/null
+++ b/project/toolkit/freetype/files.xml
@@ -0,0 +1,139 @@
+<xml>
+
+   <set name="NME_FREETYPE" value="${this_dir}/freetype/"/>
+
+   <files id="native-toolkit-freetype-depends" >
+
+      <depend name="${NME_FREETYPE}include/ft2build.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/config/ftconfig.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/config/ftheader.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/config/ftmodule.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/config/ftoption.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/config/ftstdlib.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/freetype.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftadvanc.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftbbox.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftbdf.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftbzip2.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftcache.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftchapters.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftcid.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftdriver.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/fterrdef.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/fterrors.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftfntfmt.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftgasp.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftglyph.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftgxval.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftgzip.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftimage.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftincrem.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftlcdfil.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftlist.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftlzw.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftmac.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftmm.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftmodapi.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftmoderr.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftotval.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftoutln.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftparams.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftpfr.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftrender.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftsizes.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftsnames.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftstroke.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftsynth.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftsystem.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/fttrigon.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/fttypes.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ftwinfnt.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/t1tables.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/ttnameid.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/tttables.h"/>
+      <depend name="${NME_FREETYPE}include/freetype/tttags.h"/>
+
+   </files>
+
+   <files id="native-toolkit-freetype" tags="" >
+
+      <cache value="1" />
+      <tag value="${NATIVE_TOOLKIT_OPTIM_TAG}" if="NATIVE_TOOLKIT_OPTIM_TAG" />
+      <depend files="native-toolkit-freetype-depends" />
+
+      <compilerflag value="-I${NME_FREETYPE}freetype/include/freetype" />
+      <compilerflag value="-I${NME_FREETYPE}freetype/include" />
+      <compilerflag value="-I${NME_FREETYPE}include" />
+      <compilerflag value="-DFT2_BUILD_LIBRARY" />
+
+      <!--<compilerflag value="-DNATIVE_TOOLKIT_HAVE_PNG" if="NATIVE_TOOLKIT_HAVE_PNG" />
+      <compilerflag value="-I${NME_PNG}" if="NME_PNG" />-->
+
+      <file name="${NME_FREETYPE}src/autofit/autofit.c" />
+      <file name="${NME_FREETYPE}src/base/ftadvanc.c" />
+      <file name="${NME_FREETYPE}src/base/ftbbox.c" />
+      <file name="${NME_FREETYPE}src/base/ftbitmap.c" />
+      <file name="${NME_FREETYPE}src/base/ftcalc.c" />
+      <file name="${NME_FREETYPE}src/base/ftcid.c" />
+      <file name="${NME_FREETYPE}src/base/ftdbgmem.c" />
+      <file name="${NME_FREETYPE}src/base/ftdebug.c" />
+      <file name="${NME_FREETYPE}src/base/ftfntfmt.c" />
+      <file name="${NME_FREETYPE}src/base/ftfstype.c" />
+      <file name="${NME_FREETYPE}src/base/ftgasp.c" />
+      <file name="${NME_FREETYPE}src/base/ftgloadr.c" />
+      <file name="${NME_FREETYPE}src/base/ftglyph.c" />
+      <file name="${NME_FREETYPE}src/base/ftgxval.c" />
+      <file name="${NME_FREETYPE}src/base/fthash.c" />
+      <file name="${NME_FREETYPE}src/base/ftinit.c" />
+      <file name="${NME_FREETYPE}src/base/ftlcdfil.c" />
+      <file name="${NME_FREETYPE}src/base/ftmm.c" />
+      <file name="${NME_FREETYPE}src/base/ftobjs.c" />
+      <file name="${NME_FREETYPE}src/base/ftotval.c" />
+      <file name="${NME_FREETYPE}src/base/ftoutln.c" />
+      <file name="${NME_FREETYPE}src/base/ftpatent.c" />
+      <file name="${NME_FREETYPE}src/base/ftpfr.c" />
+      <file name="${NME_FREETYPE}src/base/ftpsprop.c" />
+      <file name="${NME_FREETYPE}src/base/ftrfork.c" />
+      <file name="${NME_FREETYPE}src/base/ftsnames.c" />
+      <file name="${NME_FREETYPE}src/base/ftstream.c" />
+      <file name="${NME_FREETYPE}src/base/ftstroke.c" />
+      <file name="${NME_FREETYPE}src/base/ftsynth.c" />
+      <file name="${NME_FREETYPE}src/base/ftsystem.c" />
+      <file name="${NME_FREETYPE}src/base/fttrigon.c" />
+      <file name="${NME_FREETYPE}src/base/fttype1.c" />
+      <file name="${NME_FREETYPE}src/base/ftutil.c" />
+      <file name="${NME_FREETYPE}src/base/ftwinfnt.c" />
+      <file name="${NME_FREETYPE}src/bdf/bdf.c" />
+      <file name="${NME_FREETYPE}src/bzip2/ftbzip2.c" />
+      <file name="${NME_FREETYPE}src/cache/ftcache.c" />
+      <file name="${NME_FREETYPE}src/cff/cffcmap.c" />
+      <file name="${NME_FREETYPE}src/cff/cffdrivr.c" />
+      <file name="${NME_FREETYPE}src/cff/cffgload.c" />
+      <file name="${NME_FREETYPE}src/cff/cffload.c" />
+      <file name="${NME_FREETYPE}src/cff/cffobjs.c" />
+      <file name="${NME_FREETYPE}src/cff/cffparse.c" />
+      <!--<file name="${NME_FREETYPE}src/cff/cffpic.c" />-->
+      <file name="${NME_FREETYPE}src/cid/type1cid.c" />
+      <file name="${NME_FREETYPE}src/gzip/ftgzip.c" />
+      <file name="${NME_FREETYPE}src/lzw/ftlzw.c" />
+      <file name="${NME_FREETYPE}src/pcf/pcf.c" />
+      <file name="${NME_FREETYPE}src/pfr/pfr.c" />
+      <file name="${NME_FREETYPE}src/psaux/psaux.c" />
+      <file name="${NME_FREETYPE}src/pshinter/pshinter.c" />
+      <file name="${NME_FREETYPE}src/psnames/psmodule.c" />
+      <file name="${NME_FREETYPE}src/raster/raster.c" />
+      <file name="${NME_FREETYPE}src/sfnt/sfnt.c" />
+      <file name="${NME_FREETYPE}src/smooth/smooth.c" />
+      <file name="${NME_FREETYPE}src/truetype/truetype.c" />
+      <file name="${NME_FREETYPE}src/type1/type1.c" />
+      <file name="${NME_FREETYPE}src/type42/type42.c" />
+      <file name="${NME_FREETYPE}src/winfonts/winfnt.c" />
+      <file name="${NME_FREETYPE}src/sdf/ftsdfrend.c" />
+      <file name="${NME_FREETYPE}src/sdf/ftsdfcommon.c" />
+      <file name="${NME_FREETYPE}src/sdf/ftsdf.c" />
+      <file name="${NME_FREETYPE}src/sdf/ftbsdf.c" />
+      <file name="${NME_FREETYPE}src/svg/ftsvg.c" />
+
+   </files>
+
+</xml>
diff --git a/project/toolkit/freetype/freetype b/project/toolkit/freetype/freetype
new file mode 160000
index 000000000..d41a855aa
--- /dev/null
+++ b/project/toolkit/freetype/freetype
@@ -0,0 +1 @@
+Subproject commit d41a855aab6d8ce131c465ce01f0f536e0fb2269