diff --git a/.gitmodules b/.gitmodules
index 2d9ee5ea..ad6b3978 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "SmartIrc4net"]
 	path = SmartIrc4net
 	url = git://git.qnetp.net/smartirc4net.git
+[submodule "tools/TextTemplating"]
+	path = tools/TextTemplating
+	url = git@github.com:wimh/TextTemplating.git
diff --git a/SparkleLib/windows/transform_tt.cmd b/SparkleLib/windows/transform_tt.cmd
index efcaf908..5b60f53e 100644
--- a/SparkleLib/windows/transform_tt.cmd
+++ b/SparkleLib/windows/transform_tt.cmd
@@ -1,16 +1,11 @@
 @echo off
+cd %~dp0
 
-set common=%CommonProgramFiles(x86)%
-if "%common%"=="" set common=%CommonProgramFiles%
-set program=%ProgramFiles(x86)%
-if "%program%"=="" set program=%ProgramFiles%
-
-set TextTransform="%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe"
-if not exist %TextTransform% set TextTransform="%common%\Microsoft Shared\TextTemplating\1.2\texttransform.exe"
-if not exist %TextTransform% set TextTransform="%program%\MonoDevelop\AddIns\MonoDevelop.TextTemplating\TextTransform.exe"
+set TextTransform=..\..\tools\TextTemplating\bin\TextTransform.exe
+if not exist %TextTransform% call ..\..\tools\TextTemplating\build.cmd
 
 echo running texttransform..
-cd %~dp0
 
 %TextTransform% -out Defines.cs Defines.tt
 %TextTransform% -out GlobalAssemblyInfo.cs GlobalAssemblyInfo.tt
+
diff --git a/SparkleShare/Windows/build.cmd b/SparkleShare/Windows/build.cmd
new file mode 100644
index 00000000..f38f4de7
--- /dev/null
+++ b/SparkleShare/Windows/build.cmd
@@ -0,0 +1,6 @@
+@echo off
+set WinDirNet=%WinDir%\Microsoft.NET\Framework
+set msbuild="%WinDirNet%\v3.5\msbuild.exe"
+if not exist %msbuild% set msbuild="%WinDirNet%\v4.0.30319\msbuild.exe"
+
+%msbuild% /t:Rebuild /p:Configuration=Release /p:Platform="Any CPU" %~dp0\SparkleShare.sln
diff --git a/tools/TextTemplating b/tools/TextTemplating
new file mode 160000
index 00000000..0ca5059e
--- /dev/null
+++ b/tools/TextTemplating
@@ -0,0 +1 @@
+Subproject commit 0ca5059ef76813fe8d380563c5a08fba933e3800