diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..27bdb42
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "lib/atlex"]
+	path = lib/atlex
+	url = https://github.com/Amebis/atlex.git
+[submodule "lib/MSICALib"]
+	path = lib/MSICALib
+	url = https://github.com/Amebis/MSICALib.git
diff --git a/MSICA.sln b/MSICA.sln
index fc7bfc6..02c9508 100644
--- a/MSICA.sln
+++ b/MSICA.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atlex", "..\..\lib\atlex\build\atlex.vcxproj", "{5A4EADF2-3237-457A-9DA8-BB9942A91019}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atlex", "lib\atlex\build\atlex.vcxproj", "{5A4EADF2-3237-457A-9DA8-BB9942A91019}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "..\..\lib\MSICALib\build\MSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "lib\MSICALib\build\MSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICA", "MSICA\MSICA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}"
 EndProject
diff --git a/MSICA/MSICA.props b/MSICA/MSICA.props
index d4cb017..3ee0e65 100644
--- a/MSICA/MSICA.props
+++ b/MSICA/MSICA.props
@@ -14,7 +14,7 @@
       <LanguageCatalogs>L10N\sl_SI.po</LanguageCatalogs>
     </ResourceLocalizator>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\lib\MSICALib\include;..\..\..\lib\atlex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\MSICALib\include;..\lib\atlex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/MSICA/MSICA.vcxproj b/MSICA/MSICA.vcxproj
index 8b83c62..bc6daaf 100644
--- a/MSICA/MSICA.vcxproj
+++ b/MSICA/MSICA.vcxproj
@@ -103,7 +103,7 @@
     <ResourceCompile Include="MSICA.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\lib\MSICALib\build\MSICALib.vcxproj">
+    <ProjectReference Include="..\lib\MSICALib\build\MSICALib.vcxproj">
       <Project>{8552ee55-177e-4f51-b51b-baf7d6462cde}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/lib/MSICALib b/lib/MSICALib
new file mode 160000
index 0000000..fc7c336
--- /dev/null
+++ b/lib/MSICALib
@@ -0,0 +1 @@
+Subproject commit fc7c3365bafd09a2b4211ce1dc4a922dde1be37c
diff --git a/lib/atlex b/lib/atlex
new file mode 160000
index 0000000..b04fe38
--- /dev/null
+++ b/lib/atlex
@@ -0,0 +1 @@
+Subproject commit b04fe38b3f8956946b2b1961156f39dbac114424