diff --git a/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsEditor.addin b/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsEditor.addin
index 3ed342a85c..3f66126b7c 100644
--- a/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsEditor.addin
+++ b/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsEditor.addin
@@ -1,7 +1,12 @@
 <AddIn name        = "Settings Editor"
        author      = "Daniel Grunwald"
        copyright   = "prj:///doc/copyright.txt"
-       description = "Edits project settings">
+       description = "Edits project settings"
+       addInManagerHidden = "preinstalled">
+	
+	<Manifest>
+		<Identity name = "ICSharpCode.SettingsEditor"/>
+	</Manifest>
 	
 	<Runtime>
 		<Import assembly = "SettingsEditor.dll"/>
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.AddIn.csproj b/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.AddIn.csproj
index 17253fe613..35abf3fbd4 100644
--- a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.AddIn.csproj
+++ b/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.AddIn.csproj
@@ -43,6 +43,9 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
+      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <None Include="ComponentInspector.addin">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/ComponentInspector.Core.csproj b/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/ComponentInspector.Core.csproj
index b6948f6613..d6f8a1e4dd 100644
--- a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/ComponentInspector.Core.csproj
+++ b/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/ComponentInspector.Core.csproj
@@ -49,6 +49,9 @@
     <Reference Include="System.Configuration" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
+      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <Compile Include="Src\Debug\Debugger.cs" />
     <Compile Include="Src\ObjectBrowser\ActionMenuHelper.cs" />
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs
index b4ab892b14..7bbbdabe26 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs
@@ -18,4 +18,4 @@ using System.Reflection;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyCopyright("2005-2008 David Srbecký")]
-[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyVersion("4.0.0.0")]
diff --git a/src/AddIns/Misc/SourceAnalysis/SourceAnalysis.csproj b/src/AddIns/Misc/SourceAnalysis/SourceAnalysis.csproj
index 1e9abaef59..44a6363fed 100644
--- a/src/AddIns/Misc/SourceAnalysis/SourceAnalysis.csproj
+++ b/src/AddIns/Misc/SourceAnalysis/SourceAnalysis.csproj
@@ -44,6 +44,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
+      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
+    </Compile>
     <EmbeddedResource Include="Resources\Settings.SourceAnalysis">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </EmbeddedResource>