diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.addin b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.addin
index 16857215d6..30c8b6eb58 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.addin
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.addin
@@ -6,7 +6,7 @@
 	
 	<Manifest>
 		<Identity name="ClassWizard" version="@ClassWizard.dll"/>
-		<Dependency addin="SharpDevelop" version="2.1"/>
+		<Dependency addin="SharpDevelop" version="3.0"/>
 	</Manifest>
 	
 	<Runtime>
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.csproj b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.csproj
index c2b33eaddb..f40877e34d 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.csproj
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.csproj
@@ -1,27 +1,43 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <OutputType>Library</OutputType>
     <RootNamespace>ClassWizard</RootNamespace>
     <AssemblyName>ClassWizard</AssemblyName>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4}</ProjectGuid>
+    <OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\ClassWizard\</OutputPath>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
+    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
+    <Optimize>False</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugSymbols>True</DebugSymbols>
     <DebugType>Full</DebugType>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <StartAction>Program</StartAction>
+    <StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>obj\Release\</IntermediateOutputPath>
+    <Optimize>True</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
     <DebugSymbols>False</DebugSymbols>
     <DebugType>None</DebugType>
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -66,4 +82,5 @@
       <Name>ICSharpCode.SharpDevelop.Dom</Name>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+</Project>