diff --git a/src/AddIns/Misc/TextTemplating/Project/Resources/TextTemplating.xshd b/src/AddIns/Misc/TextTemplating/Project/Resources/TextTemplating.xshd
index a456d23cf7..34723597f3 100644
--- a/src/AddIns/Misc/TextTemplating/Project/Resources/TextTemplating.xshd
+++ b/src/AddIns/Misc/TextTemplating/Project/Resources/TextTemplating.xshd
@@ -1,7 +1,7 @@
 <SyntaxDefinition
 	xmlns="http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008"
 	name="TextTemplating"
-	extensions=".tt">
+	extensions=".tt;.t4">
 	
 	<Color name="TemplateBlockStartEndTags" foreground="Black" background="Yellow" />
 	<Color name="DirectiveKeywords" foreground="Brown" fontWeight="bold" />
diff --git a/src/AddIns/Misc/TextTemplating/Project/Templates/TextTemplate.xft b/src/AddIns/Misc/TextTemplating/Project/Templates/TextTemplate.xft
index 5b5379a19b..7f4bd0477c 100644
--- a/src/AddIns/Misc/TextTemplating/Project/Templates/TextTemplate.xft
+++ b/src/AddIns/Misc/TextTemplating/Project/Templates/TextTemplate.xft
@@ -3,7 +3,7 @@
 		name="Text Template"
 		icon="TextTemplate.File"
 		category="C#"
-		defaultname="TextTemplate${Number}.txt"
+		defaultname="TextTemplate${Number}.tt"
 		language="Default"/>
 	 
 	<Description>A t4 text template for the C# language.</Description>
diff --git a/src/AddIns/Misc/TextTemplating/Project/TextTemplating.addin b/src/AddIns/Misc/TextTemplating/Project/TextTemplating.addin
index 753d7cc8c8..d31bb6c4e1 100644
--- a/src/AddIns/Misc/TextTemplating/Project/TextTemplating.addin
+++ b/src/AddIns/Misc/TextTemplating/Project/TextTemplating.addin
@@ -13,21 +13,18 @@
 		<Import assembly="TextTemplating.dll"/>
 	</Runtime>
 	
-	<BitmapResources file="Resources\TextTemplate.File.png"/>
-	<BitmapResources file="Resources\TextTemplate.ProjectBrowser.File.png"/>
-	
 	<Path name="/SharpDevelop/Workbench/FileFilter">
 		<FileFilter
 			id="TextTemplating"
             insertbefore="AllFiles"
-            name="Text Template Files (*.tt)"
-            extensions="*.tt"/>
+            name="Text Template Files (*.tt;*.t4)"
+            extensions="*.tt;*.t4"/>
 	</Path>
 
 	<Path name="/Workspace/Icons">
 		<Icon
 			id="TextTemplateFileIcon"
-			extensions=".tt"
+			extensions=".tt;.t4"
 			resource="TextTemplate.ProjectBrowser.File"/>
 	</Path>
 
@@ -35,13 +32,13 @@
 		<CustomTool 
 			id="TextTemplatingFileGenerator"
             class="ICSharpCode.TextTemplating.TextTemplatingFileGeneratorCustomTool"
-            fileNamePattern=".tt"/>
+            fileNamePattern="\.t(t|4)$"/>
 	</Path>
 
 	<Path name="/SharpDevelop/ViewContent/AvalonEdit/SyntaxModes">
 		<SyntaxMode
 			id="TextTemplating.SyntaxMode"
-			extensions=".tt"
+			extensions=".tt;.t4"
 			name="TextTemplating"
 			resource="ICSharpCode.TextTemplating.Resources.TextTemplating.xshd"/>
 	</Path>