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 786582fe47..aad5bee367 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
@@ -1,8 +1,11 @@
 ﻿<#@ template language="C#" HostSpecific="true" #>
-<#@ output extension=".aspx" #>
 <#
 	MvcTextTemplateHost mvcHost = (MvcTextTemplateHost)Host;
 #>
+<# if (mvcHost.IsPartialView) { #>
+<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
+
+<# } else { #>
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %>
 
 <!DOCTYPE html>
@@ -16,3 +19,4 @@
 		</div>
 	</body>
 </html>
+<# } #>
\ No newline at end of file
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 12e49dffae..a426ff0af5 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
@@ -3,6 +3,9 @@
 <#
 	MvcTextTemplateHost mvcHost = (MvcTextTemplateHost)Host;
 #>
+<# if (mvcHost.IsPartialView) { #>
+
+<# } else { #>
 
 <!DOCTYPE html>
 <html>
@@ -15,3 +18,4 @@
 		</div>
 	</body>
 </html>
+<# } #>
\ No newline at end of file
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 d74dcb06ed..1fcfcf7aff 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
@@ -1,8 +1,11 @@
 ﻿<#@ template language="VB" HostSpecific="true" #>
-<#@ output extension=".aspx" #>
 <#
 	Dim mvcHost As MvcTextTemplateHost = DirectCast(Host, MvcTextTemplateHost)
 #>
+<# If mvcHost.IsPartialView Then #>
+<%@ Control Language="VB" Inherits="System.Web.Mvc.ViewUserControl" %>
+
+<# Else #>
 <%@ Page Language="VB" Inherits="System.Web.Mvc.ViewPage" %>
 
 <!DOCTYPE html>
@@ -16,3 +19,4 @@
 		</div>
 	</body>
 </html>
+<# End If #>
\ No newline at end of file
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 4d6709014f..958f902985 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
@@ -3,6 +3,9 @@
 <#
 	Dim mvcHost As MvcTextTemplateHost = DirectCast(Host, MvcTextTemplateHost)
 #>
+<# If mvcHost.IsPartialView Then #>
+
+<# Else #>
 
 <!DOCTYPE html>
 <html>
@@ -15,3 +18,4 @@
 		</div>
 	</body>
 </html>
+<# End If #>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml
index f149de2abb..08be92216a 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml
@@ -22,6 +22,7 @@
 	
 	<Grid>
 		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto"/>
 			<RowDefinition Height="Auto"/>
 			<RowDefinition Height="Auto"/>
 			<RowDefinition Height="*"/>
@@ -54,12 +55,22 @@
 			ItemTemplate="{StaticResource ViewEngineTemplate}"
 			SelectedItem="{Binding Path=SelectedViewEngine}"/>
 		
+		<TextBlock
+			Grid.Row="2"
+			Margin="4"
+			Text="Partial View:"/>
+		<CheckBox
+			Grid.Column="1"
+			Grid.Row="2"
+			Margin="2, 4, 0, 0"
+			IsChecked="{Binding Path=IsPartialView}"/>
+		
 		<StackPanel
 			Orientation="Horizontal"
 			HorizontalAlignment="Right"
 			Margin="4"
 			Grid.ColumnSpan="2"
-			Grid.Row="3">
+			Grid.Row="4">
 			<Button
 				Margin="2, 0"
 				Content="_Add"
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs
index 1d91b563d9..12248f7e82 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs
@@ -145,6 +145,11 @@ namespace ICSharpCode.AspNet.Mvc
 			string path = viewFileName.GetPath();
 			fileService.OpenFile(path);
 		}
+		
+		public bool IsPartialView {
+			get { return viewFileName.IsPartialView; }
+			set { viewFileName.IsPartialView = value; }
+		}
 	}
 }
 
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcTextTemplateHost.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcTextTemplateHost.cs
index c77a070d42..f984df16f4 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcTextTemplateHost.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcTextTemplateHost.cs
@@ -9,11 +9,15 @@ namespace ICSharpCode.AspNet.Mvc
 {
 	public interface IMvcTextTemplateHost : IDisposable
 	{
+		string Namespace { get; set; }
+		
+		// Add View properties.
 		string ViewName { get; set; }
+		bool IsPartialView { get; set; }
+		
+		// Add Controller properties.
 		string ControllerName { get; set; }
 		string ControllerRootName { get; set; }
-		string Namespace { get; set; }
-		
 		bool AddActionMethods { get; set; }
 		
 		bool ProcessTemplate(string inputFile, string outputFile);
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateFileNameExtension.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateFileNameExtension.cs
index f6facbbbf5..351247d3a5 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateFileNameExtension.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateFileNameExtension.cs
@@ -17,14 +17,23 @@ namespace ICSharpCode.AspNet.Mvc
 		
 		public static string GetViewFileExtension(
 			MvcTextTemplateType type,
-			MvcTextTemplateLanguage language)
+			MvcTextTemplateLanguage language,
+			bool isPartialView)
 		{
 			if (type.IsAspx()) {
-				return ".aspx";
+				return GetAspxFileExtension(isPartialView);
 			}
 			return GetRazorFileExtension(language);
 		}
 		
+		static string GetAspxFileExtension(bool isPartialView)
+		{
+			if (isPartialView) {
+				return ".ascx";
+			}
+			return ".aspx";
+		}
+		
 		public static string GetRazorFileExtension(MvcTextTemplateLanguage language)
 		{
 			if (language.IsVisualBasic()) {
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs
index 56d535049d..96b486565b 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs
@@ -62,5 +62,6 @@ namespace ICSharpCode.AspNet.Mvc
 		}
 		
 		public bool AddActionMethods { get; set; }
+		public bool IsPartialView { get; set; }
 	}
 }
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcViewFileGenerator.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcViewFileGenerator.cs
index 267632ee38..dd725e15a5 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcViewFileGenerator.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcViewFileGenerator.cs
@@ -36,6 +36,7 @@ namespace ICSharpCode.AspNet.Mvc
 		{
 			var viewFileName = fileName as MvcViewFileName;
 			host.ViewName = viewFileName.ViewName;
+			host.IsPartialView = viewFileName.IsPartialView;
 		}
 		
 		protected override string GetTextTemplateFileName()
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcViewFileName.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcViewFileName.cs
index 6a230467d2..b74fbd1391 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcViewFileName.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcViewFileName.cs
@@ -25,6 +25,7 @@ namespace ICSharpCode.AspNet.Mvc
 		
 		public MvcTextTemplateType TemplateType { get; set; }
 		public MvcTextTemplateLanguage TemplateLanguage { get; set; }
+		public bool IsPartialView { get; set; }
 		
 		public override string GetFileName()
 		{
@@ -43,7 +44,9 @@ namespace ICSharpCode.AspNet.Mvc
 		
 		string GetViewFileExtension()
 		{
-			return MvcTextTemplateFileNameExtension.GetViewFileExtension(TemplateType, TemplateLanguage);
+			return
+				MvcTextTemplateFileNameExtension
+					.GetViewFileExtension(TemplateType, TemplateLanguage, IsPartialView);
 		}
 		
 		public bool HasValidViewName()
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcTextTemplateHost.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcTextTemplateHost.cs
index 8711947f08..c4c0ec97c3 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcTextTemplateHost.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcTextTemplateHost.cs
@@ -37,6 +37,7 @@ namespace AspNet.Mvc.Tests.Helpers
 		public string ControllerRootName { get; set; }
 		public string Namespace { get; set; }
 		public bool AddActionMethods { get; set; }
+		public bool IsPartialView { get; set; }
 		
 		public CompilerErrorCollection Errors { get; set; }
 	}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs
index be8061f958..122102c033 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs
@@ -344,5 +344,31 @@ namespace AspNet.Mvc.Tests
 			
 			Assert.AreEqual(MvcTextTemplateType.Aspx, templateType);
 		}
+		
+		[Test]
+		public void AddMvcView_CreateAsPartialViewIsSelected_ViewFileIsPartialView()
+		{
+			CreateViewModel();
+			CSharpProjectSelected();
+			viewModel.IsPartialView = true;
+			viewModel.AddMvcView();
+			
+			bool partialView = fakeViewGenerator.FileNamePassedToGenerateFile.IsPartialView;
+			
+			Assert.IsTrue(partialView);
+		}
+		
+		[Test]
+		public void AddMvcView_CreateAsPartialViewIsNotSelected_ViewFileIsNotPartialView()
+		{
+			CreateViewModel();
+			CSharpProjectSelected();
+			viewModel.IsPartialView = false;
+			viewModel.AddMvcView();
+			
+			bool partialView = fakeViewGenerator.FileNamePassedToGenerateFile.IsPartialView;
+			
+			Assert.IsFalse(partialView);
+		}
 	}
 }
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcViewFileGeneratorTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcViewFileGeneratorTests.cs
index 0d26ffc93f..b0f9bdc4fd 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcViewFileGeneratorTests.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcViewFileGeneratorTests.cs
@@ -61,11 +61,17 @@ namespace AspNet.Mvc.Tests
 		}
 		
 		void GenerateFile(string folder, string name)
+		{
+			MvcViewFileName fileName = CreateMvcViewFileName(folder, name);
+			GenerateFile(fileName);
+		}
+		
+		MvcViewFileName CreateMvcViewFileName(string folder, string name)
 		{
 			var fileName = new MvcViewFileName();
 			fileName.Folder = folder;
 			fileName.ViewName = name;
-			GenerateFile(fileName);
+			return fileName;			
 		}
 		
 		void GenerateFile(MvcViewFileName fileName)
@@ -161,5 +167,53 @@ namespace AspNet.Mvc.Tests
 			
 			Assert.AreEqual(expectedInputFileName, inputFileName);
 		}
+		
+		[Test]
+		public void GenerateFile_IsPartialViewIsTrue_MvcTextTemplateHostIsPartialViewIsSetToTrue()
+		{
+			CreateGenerator();
+			ProjectPassedToGeneratorIsCSharpProject();
+			string viewFolder = @"d:\projects\MyProject\Views\Home";
+			string viewName = "Index";
+			MvcViewFileName fileName = CreateMvcViewFileName(viewFolder, viewName);
+			fileName.IsPartialView = true;
+			GenerateFile(fileName);
+			
+			Assert.IsTrue(fakeHost.IsPartialView);
+		}
+		
+		[Test]
+		public void GenerateFile_IsPartialViewIsFalse_MvcTextTemplateHostIsPartialViewIsSetToFalse()
+		{
+			CreateGenerator();
+			ProjectPassedToGeneratorIsCSharpProject();
+			string viewFolder = @"d:\projects\MyProject\Views\Home";
+			string viewName = "Index";
+			MvcViewFileName fileName = CreateMvcViewFileName(viewFolder, viewName);
+			fileName.IsPartialView = false;
+			GenerateFile(fileName);
+		
+			Assert.IsFalse(fakeHost.IsPartialView);
+		}
+		
+		[Test]
+		public void GenerateFile_CSharpEmptyAspxViewTemplateAndIsPartialViewIsSet_AspxUserControlFileGenerated()
+		{
+			CreateGenerator();
+			ProjectPassedToGeneratorIsCSharpProject();
+			SelectAspxTemplate();
+			
+			string viewFolder = @"d:\projects\MyProject\Views\Home";
+			string viewName = "Index";
+			MvcViewFileName fileName = CreateMvcViewFileName(viewFolder, viewName);
+			fileName.IsPartialView = true;
+			GenerateFile(fileName);
+			
+			string outputFileGenerated = fakeHost.OutputFilePassedToProcessTemplate;
+			string expectedOutputFileGenerated = 
+				@"d:\projects\MyProject\Views\Home\Index.ascx";
+			
+			Assert.AreEqual(expectedOutputFileGenerated, outputFileGenerated);
+		}
 	}
 }
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcViewFileNameTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcViewFileNameTests.cs
index 9309314f16..5fda331c10 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcViewFileNameTests.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcViewFileNameTests.cs
@@ -124,5 +124,21 @@ namespace AspNet.Mvc.Tests
 			
 			Assert.AreEqual(expectedFileName, fileName);
 		}
+		
+		[Test]
+		public void GetPath_CSharpAspxTemplateWithIsPartial_ReturnsCSharpUserControlFileName()
+		{
+			CreateFileName();
+			mvcViewFileName.TemplateType = MvcTextTemplateType.Aspx;
+			mvcViewFileName.TemplateLanguage = MvcTextTemplateLanguage.CSharp;
+			mvcViewFileName.ViewName = "Index";
+			mvcViewFileName.Folder = @"d:\projects\MyAspProject\Views\About";
+			mvcViewFileName.IsPartialView = true;
+			
+			string fileName = mvcViewFileName.GetPath();
+			string expectedFileName = @"d:\projects\MyAspProject\Views\About\Index.ascx";
+			
+			Assert.AreEqual(expectedFileName, fileName);
+		}
 	}
 }
