diff --git a/data/templates/project/CSharp/EmptyMvcWebProject.xpt b/data/templates/project/CSharp/EmptyMvcWebProject.xpt
new file mode 100644
index 0000000000..e9f1a5c68f
--- /dev/null
+++ b/data/templates/project/CSharp/EmptyMvcWebProject.xpt
@@ -0,0 +1,79 @@
+<Template
+	originator="Matt Ward"
+	created="04/06/2011"
+	lastModified="17/06/2011">
+
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<Name>Empty ASP.NET MVC Application</Name>
+		<Category>C#</Category>
+		<Subcategory>ASP.NET</Subcategory>
+		<Icon>C#.Project.Form</Icon>
+		<Description>Empty ASP.NET MVC Application</Description>
+		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
+	</TemplateConfiguration>
+
+	<Project language="C#">
+		<ProjectItems>
+			<Reference Include="System" />
+			<Reference Include="System.Web" />
+			<Reference Include="System.Web.Mvc" />
+			<Reference Include="System.Xml" />
+		</ProjectItems>
+		
+		<PropertyGroup escapeValue="False">
+			<OutputType>Library</OutputType>
+			<ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+			<AppDesignerFolder>Properties</AppDesignerFolder>
+		</PropertyGroup>
+		
+		<PropertyGroup configuration="Debug">
+			<OutputPath>bin\</OutputPath>
+		</PropertyGroup>
+		
+		<PropertyGroup configuration="Release">
+			<OutputPath>bin\</OutputPath>
+		</PropertyGroup>
+		
+		<Files>
+			<File name="Properties\AssemblyInfo.cs" src="DefaultAssemblyInfo.cs" />
+			<File name="Global.asax">
+<![CDATA[<%@ Application Codebehind="Global.asax.cs" Inherits="${StandardNamespace}.MvcApplication" Language="C#" %>
+]]>
+			</File>
+			<File name="Global.asax.cs" DependentUpon="Global.asax">
+<![CDATA[${StandardHeader.C#}
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+
+namespace ${StandardNamespace}
+{
+	public class MvcApplication : HttpApplication
+	{
+	}
+}
+]]>
+			</File>
+			<File name="web.config">
+<![CDATA[<configuration>
+	<system.web>
+		<compilation debug="true" targetFramework="4.0">
+			<assemblies>
+				<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			</assemblies>
+		</compilation>
+	
+		<pages>
+			<namespaces>
+				<add namespace="System.Web.Mvc"/>
+				<add namespace="System.Web.Mvc.Html"/>
+			</namespaces>
+		</pages>
+	</system.web>
+</configuration>
+]]>
+			</File>
+		</Files>
+	</Project>
+</Template>
diff --git a/data/templates/project/VB/EmptyMvcWebProject.xpt b/data/templates/project/VB/EmptyMvcWebProject.xpt
new file mode 100644
index 0000000000..129f8b4b9e
--- /dev/null
+++ b/data/templates/project/VB/EmptyMvcWebProject.xpt
@@ -0,0 +1,77 @@
+<Template
+	originator="Matt Ward"
+	created="04/06/2011"
+	lastModified="17/06/2011">
+
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<Name>Empty ASP.NET MVC Application</Name>
+		<Category>VB</Category>
+		<Subcategory>ASP.NET</Subcategory>
+		<Icon>VBNet.Project.Form</Icon>
+		<Description>Empty ASP.NET MVC Application</Description>
+		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
+	</TemplateConfiguration>
+
+	<Project language="VBNet">
+		<ProjectItems>
+			<Reference Include="System" />
+			<Reference Include="System.Web" />
+			<Reference Include="System.Web.Mvc" />
+			<Reference Include="System.Xml" />
+		</ProjectItems>
+		
+		<PropertyGroup escapeValue="False">
+			<OutputType>Library</OutputType>
+			<ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+			<AppDesignerFolder>Properties</AppDesignerFolder>
+		</PropertyGroup>
+		
+		<PropertyGroup configuration="Debug">
+			<OutputPath>bin\</OutputPath>
+		</PropertyGroup>
+		
+		<PropertyGroup configuration="Release">
+			<OutputPath>bin\</OutputPath>
+		</PropertyGroup>
+		
+		<Files>
+			<File name="Properties\AssemblyInfo.vb" src="DefaultAssemblyInfo.vb" />
+			<File name="Global.asax">
+<![CDATA[<%@ Application Codebehind="Global.asax.vb" Inherits="${StandardNamespace}.MvcApplication" Language="VB" %>
+]]>
+			</File>
+			<File name="Global.asax.vb" DependentUpon="Global.asax">
+<![CDATA[${StandardHeader.VBNET}
+Imports System.Web
+Imports System.Web.Mvc
+Imports System.Web.Routing
+
+Public Class MvcApplication 
+	Inherits HttpApplication
+  
+End Class
+]]>
+			</File>
+			<File name="web.config">
+<![CDATA[<configuration>
+	<system.web>
+		<compilation debug="true" targetFramework="4.0">
+			<assemblies>
+				<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			</assemblies>
+		</compilation>
+	
+		<pages>
+			<namespaces>
+				<add namespace="System.Web.Mvc"/>
+				<add namespace="System.Web.Mvc.Html"/>
+			</namespaces>
+		</pages>
+	</system.web>
+</configuration>
+]]>
+			</File>
+		</Files>
+	</Project>
+</Template>
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 401e0d620a..9893683dbe 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -809,6 +809,9 @@
 										<Component Id="CSharpMvcWebProjectTemplate" Guid="82060284-5670-4B2F-8AB0-BE075D09D4BE" DiskId="1">
 											<File Id="CSharp.MvcWebProject.xpt" Name="MvcWebProject.xpt" Source="..\..\data\templates\project\CSharp\MvcWebProject.xpt" KeyPath="yes" />
 										</Component>
+										<Component Id="EmptyCSharpMvcWebProjectTemplate" Guid="3EA7EF3D-F72A-446C-AA21-BA97EF9B321A" DiskId="1">
+											<File Id="Empty.CSharp.MvcWebProject.xpt" Name="EmptyMvcWebProject.xpt" Source="..\..\data\templates\project\CSharp\EmptyMvcWebProject.xpt" KeyPath="yes" />
+										</Component>
 									</Directory>
 									<Directory Id="MiscProjectTemplatesFolder" Name="Misc">
 										<Component Guid="F9A7F832-6EC8-4B15-A037-146BD028C9D5" Id="MiscProjectTemplates" DiskId="1">
@@ -844,6 +847,9 @@
 										<Component Id="VBMvcWebProjectTemplate" Guid="FBDC313E-FC77-4500-84EC-35F0E19925C1" DiskId="1">
 											<File Id="VB.MvcWebProject.xpt" Name="MvcWebProject.xpt" Source="..\..\data\templates\project\VB\MvcWebProject.xpt" KeyPath="yes" />
 										</Component>
+										<Component Id="EmptyVBMvcWebProjectTemplate" Guid="DCCCBDDE-6F8A-4163-8294-F84E5E76917C" DiskId="1">
+											<File Id="Empty.VB.MvcWebProject.xpt" Name="EmptyMvcWebProject.xpt" Source="..\..\data\templates\project\VB\EmptyMvcWebProject.xpt" KeyPath="yes" />
+										</Component>
 									</Directory>
 									<Component Guid="73EAC135-57B6-46C0-9F24-70A347B9AAC8" Id="ExampleProjectTemplate" DiskId="1">
 										<File Source="..\..\data\templates\project\ComplexExample.xpt.test" Id="ComplexExample.xpt.test" Name="ComplexExample.xpt.test" />
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 2f13c951de..0591c6d19f 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -298,8 +298,10 @@
 				<ComponentRef Id="CSharpRecentFilesCollectionTemplate"/>				
 				<ComponentRef Id="CSharpRecentFilesCollectionTemplateRecentFileElementClass"/>				
 				<ComponentRef Id="CSharpRecentFilesCollectionTemplateRecentFilesCollectionClass"/>
+				<ComponentRef Id="EmptyCSharpMvcWebProjectTemplate"/>
 				<ComponentRef Id="CSharpMvcWebProjectTemplate"/>
 				<ComponentRef Id="VBFileTemplates"/>
+				<ComponentRef Id="EmptyVBMvcWebProjectTemplate"/>
 				<ComponentRef Id="VBMvcWebProjectTemplate"/>
 				<ComponentRef Id="EmptyHTMLFileTemplate"/>
 				<ComponentRef Id="EmptyMsBuildFileTemplate"/>