diff --git a/data/templates/file/CSharp/CSharp.Forms.Form.xft b/data/templates/file/CSharp/CSharp.Forms.Form.xft
index a8b6ad17e9..20a2d10344 100644
--- a/data/templates/file/CSharp/CSharp.Forms.Form.xft
+++ b/data/templates/file/CSharp/CSharp.Forms.Form.xft
@@ -11,6 +11,11 @@
 	 
 	<Description>${res:Templates.File.WindowsForm.Description}</Description>
 	
+	<References>
+		<Reference include="System.Drawing" />
+		<Reference include="System.Windows.Forms" />
+	</References>
+	
 	<!-- 
 	Special new file templates:
 		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
diff --git a/data/templates/file/CSharp/CSharp.Forms.UserControl.xft b/data/templates/file/CSharp/CSharp.Forms.UserControl.xft
index 47eb5725b0..cff65eaa4e 100644
--- a/data/templates/file/CSharp/CSharp.Forms.UserControl.xft
+++ b/data/templates/file/CSharp/CSharp.Forms.UserControl.xft
@@ -12,6 +12,11 @@
 	 
 	<Description>${res:Templates.File.WindowsUserControl.Description}</Description>
 	
+	<References>
+		<Reference include="System.Drawing" />
+		<Reference include="System.Windows.Forms" />
+	</References>
+	
 	<!-- 
 	Special new file templates:
 		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
diff --git a/data/templates/file/CSharp/CSharp.UnitTest.xft b/data/templates/file/CSharp/CSharp.UnitTest.xft
index 3ba792369c..046399e532 100644
--- a/data/templates/file/CSharp/CSharp.UnitTest.xft
+++ b/data/templates/file/CSharp/CSharp.UnitTest.xft
@@ -45,7 +45,11 @@
 			description   = "${res:Templates.File.Properties.AddTearDownCode.Description}"
 		/>
 	</Properties>
-		
+	
+	<References>
+		<Reference include="NUnit.Framework" hintPath="$(SharpDevelopBinPath)\Tools\NUnit\NUnit.Framework.dll" />
+	</References>
+	
 	<Files>
 		<File name="${FullName}" language="C#"><![CDATA[${StandardHeader.C#}
 <% if (ConditionalClass) { %>#if TEST
diff --git a/data/templates/file/VBNet/VBNet.Forms.Form.xft b/data/templates/file/VBNet/VBNet.Forms.Form.xft
index 02ef87a2e0..06ecd1644a 100644
--- a/data/templates/file/VBNet/VBNet.Forms.Form.xft
+++ b/data/templates/file/VBNet/VBNet.Forms.Form.xft
@@ -12,6 +12,11 @@
 	
 	<Description>${res:Templates.File.WindowsForm.Description}</Description>
 	
+		<References>
+		<Reference include="System.Drawing" />
+		<Reference include="System.Windows.Forms" />
+	</References>
+	
 	<!-- 
 	Special new file templates:
 		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
diff --git a/data/templates/file/VBNet/VBNet.Forms.UserControl.xft b/data/templates/file/VBNet/VBNet.Forms.UserControl.xft
index 705c872378..a1628cbc5b 100644
--- a/data/templates/file/VBNet/VBNet.Forms.UserControl.xft
+++ b/data/templates/file/VBNet/VBNet.Forms.UserControl.xft
@@ -11,6 +11,11 @@
 	
 	<Description>${res:Templates.File.WindowsUserControl.Description}</Description>
 	
+	<References>
+		<Reference include="System.Drawing" />
+		<Reference include="System.Windows.Forms" />
+	</References>
+	
 	<!-- 
 	Special new file templates:
 		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
diff --git a/data/templates/file/VBNet/VBNet.UnitTest.xft b/data/templates/file/VBNet/VBNet.UnitTest.xft
index bca04d821b..3aa6a16c9c 100644
--- a/data/templates/file/VBNet/VBNet.UnitTest.xft
+++ b/data/templates/file/VBNet/VBNet.UnitTest.xft
@@ -37,7 +37,11 @@
 			description   = "${res:Templates.File.Properties.AddTearDownCode.Description}"
 		/>
 	</Properties>
-		
+	
+	<References>
+		<Reference include="NUnit.Framework" hintPath="$(SharpDevelopBinPath)\Tools\NUnit\NUnit.Framework.dll" />
+	</References>
+	
 	<Files>
 		<File name="${FullName}" language="VBNET"><![CDATA[${StandardHeader.VBNET}
 
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs
index 0294f2c4f4..60722f498b 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs
@@ -5,20 +5,20 @@
 //     <version>$Revision$</version>
 // </file>
 
-using ICSharpCode.TextEditor.Document;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
 using ICSharpCode.SharpDevelop.Gui.XmlForms;
 using ICSharpCode.SharpDevelop.Internal.Templates;
 using ICSharpCode.SharpDevelop.Project;
-using Microsoft.Build.BuildEngine;
 
 namespace ICSharpCode.SharpDevelop.Gui
 {
@@ -251,7 +251,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 						} else {
 							string defVal = property.DefaultValue == null ? String.Empty : property.DefaultValue.ToString();
 							StringParser.Properties["Properties." + localizedProperty.Name] = defVal;
-							localizedProperty.DefaultValue = defVal;			
+							localizedProperty.DefaultValue = defVal;
 						}
 					}
 					localizedProperty.LocalizedName = property.LocalizedName;
@@ -472,6 +472,22 @@ namespace ICSharpCode.SharpDevelop.Gui
 				
 				StringParser.Properties["ClassName"] = GenerateValidClassOrNamespaceName(Path.GetFileNameWithoutExtension(fileName), false);
 				
+				// when adding a file to a project (but not when creating a standalone file while a project is open):
+				if (ProjectService.CurrentProject != null && !this.allowUntitledFiles) {
+					// add required assembly references to the project
+					bool changes = false;
+					foreach (ReferenceProjectItem reference in item.Template.RequiredAssemblyReferences) {
+						IEnumerable<ProjectItem> refs = ProjectService.CurrentProject.GetItemsOfType(ItemType.Reference);
+						if (!refs.Any(projItem => string.Equals(projItem.Include, reference.Include, StringComparison.InvariantCultureIgnoreCase))) {
+							ReferenceProjectItem projItem = (ReferenceProjectItem)reference.CloneFor(ProjectService.CurrentProject);
+							ProjectService.AddProjectItem(ProjectService.CurrentProject, projItem);
+							changes = true;
+						}
+					}
+					if (changes) {
+						ProjectService.CurrentProject.Save();
+					}
+				}
 				
 				if (item.Template.WizardPath != null) {
 					Properties customizer = new Properties();
diff --git a/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs b/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs
index 93644350cc..48b7bf9f54 100644
--- a/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs
+++ b/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs
@@ -12,6 +12,7 @@ using System.IO;
 using System.Xml;
 
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Project;
 
 namespace ICSharpCode.SharpDevelop.Internal.Templates
 {
@@ -119,6 +120,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 		List<FileDescriptionTemplate> files = new List<FileDescriptionTemplate>();
 		List<TemplateProperty> properties  = new List<TemplateProperty>();
 		List<TemplateType> customTypes = new List<TemplateType>();
+		List<ReferenceProjectItem> requiredAssemblyReferences = new List<ReferenceProjectItem>();
 		
 		XmlElement fileoptions = null;
 		
@@ -205,6 +207,10 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 			}
 		}
 		
+		public List<ReferenceProjectItem> RequiredAssemblyReferences {
+			get { return requiredAssemblyReferences; }
+		}
+		
 		public bool HasProperties {
 			get {
 				return properties != null && properties.Count > 0;
@@ -257,6 +263,16 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 				}
 			}
 			
+			if (doc.DocumentElement["References"] != null) {
+				XmlNodeList references = doc.DocumentElement["References"].SelectNodes("Reference");
+				foreach (XmlElement reference in references) {
+					if (!reference.HasAttribute("include"))
+						throw new InvalidDataException("Reference without 'include' attribute!");
+					ReferenceProjectItem item = new ReferenceProjectItem(null, reference.GetAttribute("include"));
+					requiredAssemblyReferences.Add(item);
+				}
+			}
+			
 			fileoptions = doc.DocumentElement["AdditionalOptions"];
 			
 			doc.DocumentElement.SetAttribute("fileName", filename); // used for template loading warnings
diff --git a/src/Main/Base/Project/Src/Project/Items/ProjectItem.cs b/src/Main/Base/Project/Src/Project/Items/ProjectItem.cs
index 81781975a1..1a5a4d4fbd 100644
--- a/src/Main/Base/Project/Src/Project/Items/ProjectItem.cs
+++ b/src/Main/Base/Project/Src/Project/Items/ProjectItem.cs
@@ -8,11 +8,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
 using System.IO;
-using System.Text;
-using System.Xml;
+using System.Linq;
 
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;