diff --git a/.gitmodules b/.gitmodules
index bd017561..e28ac3d4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,3 +6,6 @@
         path = Source/FreePascalSupport/FPC_StringBuilder
 	
         url = https://github.com/Wosi/FPC_StringBuilder.git
+[submodule "Source/FastMM4"]
+	path = Source/FastMM4
+	url = https://github.com/pleriche/FastMM4
diff --git a/Demo/Parser/ParserDemo.dproj b/Demo/Parser/ParserDemo.dproj
index 1c9df898..976a5b7d 100644
--- a/Demo/Parser/ParserDemo.dproj
+++ b/Demo/Parser/ParserDemo.dproj
@@ -35,7 +35,7 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <DCC_UnitSearchPath>..\..\Source;..\..\Source\SimpleParser;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\Source;..\..\Source\SimpleParser;..\..\Source\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <SanitizedProjectName>ParserDemo</SanitizedProjectName>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
diff --git a/Demo/ProjectIndexer/ProjectIndexerResearch.dproj b/Demo/ProjectIndexer/ProjectIndexerResearch.dproj
index e3b81dda..d81dfaa3 100644
--- a/Demo/ProjectIndexer/ProjectIndexerResearch.dproj
+++ b/Demo/ProjectIndexer/ProjectIndexerResearch.dproj
@@ -35,7 +35,7 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <DCC_UnitSearchPath>..\..\source;..\..\source\simpleparser;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\source;..\..\source\simpleparser;..\..\source\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
         <DCC_K>false</DCC_K>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
diff --git a/Source/FastMM4 b/Source/FastMM4
new file mode 160000
index 00000000..8ee64109
--- /dev/null
+++ b/Source/FastMM4
@@ -0,0 +1 @@
+Subproject commit 8ee641096e4db76fbe9974ec454882601fd0a407