diff --git a/src/AddIns/Misc/TextTemplating/Project/Templates/TextTemplate.xft b/src/AddIns/Misc/TextTemplating/Project/Templates/CSharp.TextTemplate.xft
similarity index 71%
rename from src/AddIns/Misc/TextTemplating/Project/Templates/TextTemplate.xft
rename to src/AddIns/Misc/TextTemplating/Project/Templates/CSharp.TextTemplate.xft
index ffa2431abd..fee4363418 100644
--- a/src/AddIns/Misc/TextTemplating/Project/Templates/TextTemplate.xft
+++ b/src/AddIns/Misc/TextTemplating/Project/Templates/CSharp.TextTemplate.xft
@@ -6,14 +6,15 @@
 		defaultname="TextTemplate${Number}.tt"
 		language="Default"/>
 	 
-	<Description>A t4 text template for the C# language.</Description>
+	<Description>A T4 Text Template for the C# language.</Description>
 
 	<Files>
 		<File
       name="${FullName}"
       language="Default"
       buildAction="None"
-      Generator="TextTemplatingFileGenerator"><![CDATA[<#@ template language="C#" #>
+      Generator="TextTemplatingFileGenerator">
+<![CDATA[<#@ template language="C#" #>
 <#@ output extension=".txt" #>
 ]]></File>
 	</Files>
diff --git a/src/AddIns/Misc/TextTemplating/Project/Templates/VB.TextTemplate.xft b/src/AddIns/Misc/TextTemplating/Project/Templates/VB.TextTemplate.xft
new file mode 100644
index 0000000000..6735c891ff
--- /dev/null
+++ b/src/AddIns/Misc/TextTemplating/Project/Templates/VB.TextTemplate.xft
@@ -0,0 +1,22 @@
+<Template author="Matt Ward" version="1.0">	
+	<Config
+		name="Text Template"
+		icon="TextTemplate.File"
+		category="VB"
+		defaultname="TextTemplate${Number}.tt"
+		language="Default"/>
+	 
+	<Description>A T4 Text Template for the VB.NET language.</Description>
+
+	<Files>
+		<File
+      name="${FullName}"
+      language="Default"
+      buildAction="None"
+      Generator="TextTemplatingFileGenerator">
+<![CDATA[<#@ template language="VB" #>
+<#@ output extension=".txt" #>
+]]></File>
+	</Files>
+	<AdditionalOptions/>
+</Template>
diff --git a/src/AddIns/Misc/TextTemplating/Project/TextTemplating.csproj b/src/AddIns/Misc/TextTemplating/Project/TextTemplating.csproj
index 52018dbb55..c907ec8503 100644
--- a/src/AddIns/Misc/TextTemplating/Project/TextTemplating.csproj
+++ b/src/AddIns/Misc/TextTemplating/Project/TextTemplating.csproj
@@ -75,7 +75,10 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\TextTemplating.xshd" />
-    <None Include="Templates\TextTemplate.xft">
+    <None Include="Templates\CSharp.TextTemplate.xft">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Templates\VB.TextTemplate.xft">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="TextTemplating.addin">
diff --git a/src/AddIns/Misc/TextTemplating/TextTemplating.sln b/src/AddIns/Misc/TextTemplating/TextTemplating.sln
index 7d3ca24b52..9dc8a09485 100644
--- a/src/AddIns/Misc/TextTemplating/TextTemplating.sln
+++ b/src/AddIns/Misc/TextTemplating/TextTemplating.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.1.0.7318-alpha
+# SharpDevelop 4.1.0.7374-alpha
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTemplating", "Project\TextTemplating.csproj", "{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "..\..\..\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj", "{87E61430-4243-45F2-B74E-0A4C096CEBF3}"
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index c9ab391ba4..401e0d620a 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -1569,8 +1569,11 @@
 										<File Id="TextTemplating.dll" Name="TextTemplating.dll" Source="..\..\AddIns\Misc\TextTemplating\TextTemplating.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="TextTemplating.dll" AssemblyManifest="TextTemplating.dll" />
 									</Component>
 									<Directory Id="TextTemplatingTemplates" Name="Templates">
-										<Component Id="TextTemplateFileTemplate" Guid="EE27739F-3F4D-4C9F-99F0-0E9831001BD7" DiskId="1">
-											<File Id="TextTemplate.xft" Name="TextTemplate.xft" Source="..\..\AddIns\Misc\TextTemplating\Templates\TextTemplate.xft" KeyPath="yes" />
+										<Component Id="CSharpTextTemplateFileTemplate" Guid="D271B972-2CBB-4615-9D35-23F75969CA9B" DiskId="1">
+											<File Id="CSharp.TextTemplate.xft" Name="CSharp.TextTemplate.xft" Source="..\..\AddIns\Misc\TextTemplating\Templates\CSharp.TextTemplate.xft" KeyPath="yes" />
+										</Component>
+										<Component Id="VBTextTemplateFileTemplate" Guid="21E9FFAB-491C-48A4-BD3D-41E596C50D66" DiskId="1">
+											<File Id="VB.TextTemplate.xft" Name="VB.TextTemplate.xft" Source="..\..\AddIns\Misc\TextTemplating\Templates\VB.TextTemplate.xft" KeyPath="yes" />
 										</Component>
 									</Directory>
 								</Directory>
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index a749589184..2f13c951de 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -528,7 +528,8 @@
 				<ComponentRef Id="MonoTextTemplatingDll"/>
 				<ComponentRef Id="TextTemplatingAddin"/>
 				<ComponentRef Id="TextTemplatingDll"/>
-				<ComponentRef Id="TextTemplateFileTemplate"/>
+				<ComponentRef Id="CSharpTextTemplateFileTemplate"/>
+				<ComponentRef Id="VBTextTemplateFileTemplate"/>
 			</Feature>
 			<Feature Id="SharpDevelopFileAssociations"
 			         Level="2"