diff --git a/src/Tools/WrapperGenerator/CodeGenerator.cs b/src/Tools/WrapperGenerator/CodeGenerator.cs
index 9a239def19..6ae91c236a 100644
--- a/src/Tools/WrapperGenerator/CodeGenerator.cs
+++ b/src/Tools/WrapperGenerator/CodeGenerator.cs
@@ -152,6 +152,7 @@ namespace WrapperGenerator
 			
 			CodeTypeDeclaration codeTypeDeclaration = new CodeTypeDeclaration();
 			codeTypeDeclaration.Attributes = MemberAttributes.Private;
+			codeTypeDeclaration.IsPartial = true;
 			codeTypeDeclaration.Name = type.Name;
 			if (baseType != null) {
 				codeTypeDeclaration.BaseTypes.Add(baseType.Name);
diff --git a/src/Tools/WrapperGenerator/MainForm.cs b/src/Tools/WrapperGenerator/MainForm.cs
index 8c4471ad2c..2e94c4ead9 100644
--- a/src/Tools/WrapperGenerator/MainForm.cs
+++ b/src/Tools/WrapperGenerator/MainForm.cs
@@ -27,6 +27,8 @@ namespace WrapperGenerator
 				"//     <owner name=\"David Srbecký\" email=\"dsrbecky@gmail.com\"/>" + "\r\n" + 
 				"//     <version>$Revision$</version>" + "\r\n" + 
 				"// </file>" + "\r\n" +
+				"\r\n" +
+				"// This file is automatically generated - any changes will be lost" + "\r\n" +
 				"\r\n";
 		//string dllFileName = Assembly.GetExecutingAssembly().Location;
 		string dllFileName = Path.Combine(Assembly.GetExecutingAssembly().Location, @"..\..\..\..\..\..\AddIns\AddIns\Misc\Debugger\Debugger.Core.dll");
@@ -37,10 +39,10 @@ namespace WrapperGenerator
 			InitializeComponent();
 			
 			CodeGenerator codeGenerator1 = new CorDebugGenerator(Assembly.LoadFile(dllFileName));
-			textBox1.Text = new FileGenerator(codeGenerator1, header).SaveFiles(saveDirectory + @"\CorDebug");
+			textBox1.Text = new FileGenerator(codeGenerator1, header).SaveFiles(saveDirectory + @"\CorDebug\Autogenerated");
 			
 			CodeGenerator codeGenerator2 = new CorSymGenerator(Assembly.LoadFile(dllFileName));
-			textBox1.Text += new FileGenerator(codeGenerator2, header).SaveFiles(saveDirectory + @"\CorSym");
+			textBox1.Text += new FileGenerator(codeGenerator2, header).SaveFiles(saveDirectory + @"\CorSym\Autogenerated");
 		}
 		
 		[STAThread]