diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Empty.tt b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Empty.tt
index 6b838a049b..9676e1c93b 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Empty.tt
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Empty.tt
@@ -5,6 +5,17 @@
 <# if (mvcHost.IsPartialView) { #>
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
 
+<# } else if(mvcHost.IsContentPage) { #>
+<%@ Page Language="C#" MasterPageFile="<#= mvcHost.MasterPageFile #>" Inherits="System.Web.Mvc.ViewPage<#= GetViewPageType() #>" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="Title" runat="server">
+<#= mvcHost.ViewName #>
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="Main" runat="server">
+	
+</asp:Content>
+
 <# } else { #>
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<#= GetViewPageType() #>" %>
 
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/CSHTML/Empty.tt b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/CSHTML/Empty.tt
index 5250e643d8..16197df313 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/CSHTML/Empty.tt
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/CSHTML/Empty.tt
@@ -5,6 +5,14 @@
 #>
 <# if (mvcHost.IsPartialView) { #>
 
+<# } else if (mvcHost.IsContentPage) { #>
+@{
+	ViewBag.Title = "<#= mvcHost.ViewName #>";
+	Layout = "<#= mvcHost.MasterPageFile #>";
+}
+
+<h2><#= mvcHost.ViewName #></h2>
+
 <# } else { #>
 <#= GetModelDirective() #>
 
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/VisualBasic/CodeTemplates/AddView/AspxVisualBasic/Empty.tt b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/VisualBasic/CodeTemplates/AddView/AspxVisualBasic/Empty.tt
index bcd4186109..af3dcc4ebd 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/VisualBasic/CodeTemplates/AddView/AspxVisualBasic/Empty.tt
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/VisualBasic/CodeTemplates/AddView/AspxVisualBasic/Empty.tt
@@ -5,6 +5,17 @@
 <# If mvcHost.IsPartialView Then #>
 <%@ Control Language="VB" Inherits="System.Web.Mvc.ViewUserControl" %>
 
+<# ElseIf mvcHost.IsContentPage Then #>
+<%@ Page Language="VB" MasterPageFile="<#= mvcHost.MasterPageFile #>" Inherits="System.Web.Mvc.ViewPage<#= GetViewPageType() #>" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="Title" runat="server">
+<#= mvcHost.ViewName #>
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="Main" runat="server">
+	
+</asp:Content>
+
 <# Else #>
 <%@ Page Language="VB" Inherits="System.Web.Mvc.ViewPage<#= GetViewPageType() #>" %>
 
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/VisualBasic/CodeTemplates/AddView/VBHTML/Empty.tt b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/VisualBasic/CodeTemplates/AddView/VBHTML/Empty.tt
index 8d020929d1..661e938e6e 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/VisualBasic/CodeTemplates/AddView/VBHTML/Empty.tt
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/VisualBasic/CodeTemplates/AddView/VBHTML/Empty.tt
@@ -5,6 +5,14 @@
 #>
 <# If mvcHost.IsPartialView Then #>
 
+<# ElseIf mvcHost.IsContentPage Then #>
+@Code
+	ViewData("Title") = "<#= mvcHost.ViewName #>"
+	Layout = "<#= mvcHost.MasterPageFile #>"
+End Code
+
+<h2><#= mvcHost.ViewName #></h2>
+
 <# Else #>
 <#= GetModelDirective() #>
 
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml
index ceeb25fa1d..01b6062ec3 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml
@@ -124,7 +124,7 @@
 			Grid.Row="7"
 			Grid.Column="1"
 			IsEnabled="{Binding Path=IsContentPage}"
-			Text="{Binding Path=ContentPage}"/>
+			Text="{Binding Path=MasterPageFile}"/>
 		
 		<StackPanel
 			Orientation="Horizontal"
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs
index d7802942b9..eb03a0cb63 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs
@@ -152,12 +152,22 @@ namespace ICSharpCode.AspNet.Mvc
 		
 		void ConfigureMvcViewGenerator()
 		{
+			viewGenerator.IsContentPage	= IsContentPage;
+			viewGenerator.MasterPageFile = GetMasterPageFile();
 			viewGenerator.ModelClassName = GetModelClassName();
 			viewGenerator.Project = selectedViewFolder.Project;
 			viewGenerator.TemplateLanguage = GetTemplateLanguage();
 			viewGenerator.TemplateType = selectedViewEngine.TemplateType;
 		}
 		
+		string GetMasterPageFile()
+		{
+			if (IsContentPage) {
+				return MasterPageFile;
+			}
+			return String.Empty;
+		}
+		
 		string GetModelClassName()
 		{
 			if (IsStronglyTypedView) {
@@ -203,7 +213,7 @@ namespace ICSharpCode.AspNet.Mvc
 		
 		public MvcModelClassViewModel SelectedModelClass { get; set; }
 		public string ModelClassName { get; set; }
-		public string ContentPage { get; set; }
+		public string MasterPageFile { get; set; }
 	}
 }
 
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcTextTemplateHost.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcTextTemplateHost.cs
index 7f1c0a4333..12b50c63e6 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcTextTemplateHost.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcTextTemplateHost.cs
@@ -15,6 +15,8 @@ namespace ICSharpCode.AspNet.Mvc
 		string ViewName { get; set; }
 		bool IsPartialView { get; set; }
 		string ViewDataTypeName { get; set; }
+		bool IsContentPage { get; set; }
+		string MasterPageFile { get; set; }
 		
 		// Add Controller properties.
 		string ControllerName { get; set; }
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcViewFileGenerator.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcViewFileGenerator.cs
index 6cf9c50b69..adbb175cb4 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcViewFileGenerator.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcViewFileGenerator.cs
@@ -12,6 +12,8 @@ namespace ICSharpCode.AspNet.Mvc
 		MvcTextTemplateType TemplateType { get; set; }
 		IMvcProject Project { get; set; }
 		string ModelClassName { get; set; }
+		bool IsContentPage { get; set; }
+		string MasterPageFile { get; set; }
 		
 		void GenerateFile(MvcViewFileName fileName);
 	}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs
index d393f4d997..b0620b6bad 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs
@@ -11,6 +11,7 @@ namespace ICSharpCode.AspNet.Mvc
 		string viewName = String.Empty;
 		string viewDataTypeName = String.Empty;
 		string @namespace = String.Empty;
+		string masterPageFile = String.Empty;
 		MvcControllerName controllerName = new MvcControllerName();
 		
 		public MvcTextTemplateHost(
@@ -69,5 +70,11 @@ namespace ICSharpCode.AspNet.Mvc
 		
 		public bool AddActionMethods { get; set; }
 		public bool IsPartialView { get; set; }
+		public bool IsContentPage { get; set; }
+		
+		public string MasterPageFile {
+			get { return masterPageFile; }
+			set { masterPageFile = UseEmptyStringIfNull(value); }
+		}
 	}
 }
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcViewFileGenerator.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcViewFileGenerator.cs
index 74466a9946..5d9088d302 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcViewFileGenerator.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcViewFileGenerator.cs
@@ -24,10 +24,13 @@ namespace ICSharpCode.AspNet.Mvc
 		{
 			this.textTemplateRepository = textTemplateRepository;
 			ModelClassName = String.Empty;
+			MasterPageFile = String.Empty;
 		}
 		
 		public MvcTextTemplateType TemplateType { get; set; }
 		public string ModelClassName { get; set; }
+		public bool IsContentPage { get; set; }
+		public string MasterPageFile { get; set; }
 		
 		public void GenerateFile(MvcViewFileName fileName)
 		{
@@ -36,8 +39,11 @@ namespace ICSharpCode.AspNet.Mvc
 		
 		protected override void ConfigureHost(IMvcTextTemplateHost host, MvcFileName fileName)
 		{
+			host.IsContentPage = IsContentPage;
+			
 			var viewFileName = fileName as MvcViewFileName;
 			host.IsPartialView = viewFileName.IsPartialView;
+			host.MasterPageFile = MasterPageFile;
 			host.ViewDataTypeName = ModelClassName;
 			host.ViewName = viewFileName.ViewName;
 		}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcTextTemplateHost.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcTextTemplateHost.cs
index 38ab12e195..d5f38a5f70 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcTextTemplateHost.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcTextTemplateHost.cs
@@ -39,6 +39,8 @@ namespace AspNet.Mvc.Tests.Helpers
 		public bool AddActionMethods { get; set; }
 		public bool IsPartialView { get; set; }
 		public string ViewDataTypeName { get; set; }
+		public bool IsContentPage { get; set; }
+		public string MasterPageFile { get; set; }
 		
 		public CompilerErrorCollection Errors { get; set; }
 	}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcViewFileGenerator.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcViewFileGenerator.cs
index aa888aefa1..3c8b6c0123 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcViewFileGenerator.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcViewFileGenerator.cs
@@ -13,6 +13,8 @@ namespace AspNet.Mvc.Tests.Helpers
 		public MvcTextTemplateType TemplateType { get; set; }
 		public IMvcProject Project { get; set; }
 		public string ModelClassName { get; set; }
+		public bool IsContentPage { get; set; }
+		public string MasterPageFile { get; set; }
 		
 		public bool IsGenerateFileCalled;
 		public MvcViewFileName FileNamePassedToGenerateFile;
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs
index e66c73b54d..2a828e1722 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs
@@ -614,5 +614,43 @@ namespace AspNet.Mvc.Tests
 			
 			Assert.IsTrue(fired);
 		}
+		
+		[Test]
+		public void AddMvcView_IsContentPageIsTrue_IsContentPageIsSetToTrueOnViewGenerator()
+		{
+			CreateViewModel();
+			viewModel.IsContentPage = true;
+			viewModel.AddMvcView();
+			
+			bool contentPage = fakeViewGenerator.IsContentPage;
+			
+			Assert.IsTrue(contentPage);
+		}
+		
+		[Test]
+		public void AddMvcView_ContentPageIsDefinedAndIsContentPageIsTrue_ContentPageIsConfiguredOnViewGenerator()
+		{
+			CreateViewModel();
+			viewModel.IsContentPage = true;
+			viewModel.MasterPageFile = "~/Views/Shared/Site.Master";
+			viewModel.AddMvcView();
+			
+			string masterPage = fakeViewGenerator.MasterPageFile;
+			
+			Assert.AreEqual("~/Views/Shared/Site.Master", masterPage);
+		}
+		
+		[Test]
+		public void AddMvcView_ContentPageIsDefinedAndIsContentPageIsFalse_ContentPageIsEmptyStringOnViewGenerator()
+		{
+			CreateViewModel();
+			viewModel.IsContentPage = false;
+			viewModel.MasterPageFile = "~/Views/Shared/Site.Master";
+			viewModel.AddMvcView();
+			
+			string masterPage = fakeViewGenerator.MasterPageFile;
+			
+			Assert.AreEqual(String.Empty, masterPage);
+		}
 	}
 }
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcTextTemplateHostTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcTextTemplateHostTests.cs
index 1f7c9c86ca..727231190a 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcTextTemplateHostTests.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcTextTemplateHostTests.cs
@@ -96,5 +96,15 @@ namespace AspNet.Mvc.Tests
 			
 			Assert.AreEqual(String.Empty, typeName);
 		}
+		
+		[Test]
+		public void MasterPageFile_SetToNull_ReturnsEmptyString()
+		{
+			CreateHost();
+			host.MasterPageFile = null;
+			string masterPage = host.MasterPageFile;
+			
+			Assert.AreEqual(String.Empty, masterPage);
+		}
 	}
 }
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcViewFileGeneratorTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcViewFileGeneratorTests.cs
index d90b72078e..889742ad22 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcViewFileGeneratorTests.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcViewFileGeneratorTests.cs
@@ -238,5 +238,39 @@ namespace AspNet.Mvc.Tests
 			
 			Assert.AreEqual(String.Empty, modelClassName);
 		}
+		
+		[Test]
+		public void GenerateFile_IsContentPageIsTrue_IsContentPageIsSetOnMvcTextTemplateHost()
+		{
+			CreateGenerator();
+			generator.IsContentPage = true;
+			GenerateFile();
+			
+			bool contentPage = fakeHost.IsContentPage;
+			
+			Assert.IsTrue(contentPage);
+		}
+		
+		[Test]
+		public void MasterPageFile_DefaultValue_ReturnsEmptyString()
+		{
+			CreateGenerator();
+			string masterPage = generator.MasterPageFile;
+			
+			Assert.AreEqual(String.Empty, masterPage);
+		}
+		
+		[Test]
+		public void GenerateFile_MasterPageFileIsSet_MasterPageFileIsSetOnMvcTextTemplateHost()
+		{
+			CreateGenerator();
+			generator.IsContentPage = true;
+			generator.MasterPageFile = "~/Views/Shared/Site.Master";
+			GenerateFile();
+			
+			string masterPage = fakeHost.MasterPageFile;
+			
+			Assert.AreEqual("~/Views/Shared/Site.Master", masterPage);
+		}
 	}
 }