diff --git a/Project/Configuration/GlobalAssemblyInfo.cs b/Project/Configuration/GlobalAssemblyInfo.cs
deleted file mode 100644
index 73d9df7..0000000
--- a/Project/Configuration/GlobalAssemblyInfo.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
-//     <version>$Revision: 1040 $</version>
-// </file>
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////
-//                                                                                         //
-// DO NOT EDIT GlobalAssemblyInfo.cs, it is recreated using AssemblyInfo.template whenever //
-// StartUp is compiled.                                                                    //
-//                                                                                         //
-/////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-
-[assembly: ComVisible(visibility: false)]
-[assembly: AssemblyCompany("ic#code")]
-[assembly: AssemblyProduct("GitExtensions")]
-[assembly: AssemblyCopyright("2000-2010 AlphaSierraPapa")]
-[assembly: AssemblyVersion(RevisionClass.FullVersion)]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-internal static class RevisionClass
-{
-    public const string Major = "4";
-    public const string Minor = "0";
-    public const string Build = "2";
-    public const string Revision = "6466";
-
-    public const string MainVersion = Major + "." + Minor;
-    public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
-}
\ No newline at end of file
diff --git a/Project/ICSharpCode.TextEditor.csproj b/Project/ICSharpCode.TextEditor.csproj
index 960d09d..8fc5b30 100644
--- a/Project/ICSharpCode.TextEditor.csproj
+++ b/Project/ICSharpCode.TextEditor.csproj
@@ -71,7 +71,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Configuration\GlobalAssemblyInfo.cs" />
+    <Compile Include="..\..\..\CommonAssemblyInfoExternals.cs">
+      <Link>Properties\CommonAssemblyInfoExternals.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Src\Document\DefaultDocument.cs" />
     <Compile Include="Src\Document\DocumentEventArgs.cs" />
     <Compile Include="Src\Document\DocumentFactory.cs" />
@@ -202,7 +205,6 @@
     </Compile>
     <Compile Include="Src\Document\BookmarkManager\Bookmark.cs" />
     <Compile Include="Src\Document\BookmarkManager\BookmarkEventHandler.cs" />
-    <Compile Include="Configuration\AssemblyInfo.cs" />
     <EmbeddedResource Include="Resources\ASPX.xshd" />
     <EmbeddedResource Include="Resources\ActionScript.xshd" />
     <EmbeddedResource Include="Resources\Ada.xshd" />
diff --git a/Project/Configuration/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
similarity index 66%
rename from Project/Configuration/AssemblyInfo.cs
rename to Project/Properties/AssemblyInfo.cs
index 715572a..cd11f89 100644
--- a/Project/Configuration/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -5,15 +5,16 @@
 //     <version>$Revision$</version>
 // </file>
 
-using System;
 using System.Reflection;
+using System.Resources;
 using System.Runtime.CompilerServices;
 
-[assembly: CLSCompliant(isCompliant: true)]
+[assembly: AssemblyCompany("ic#code")]
+[assembly: AssemblyCopyright("2000-2010 AlphaSierraPapa")]
+[assembly: NeutralResourcesLanguage("en-US")]
+
 [assembly: StringFreezing]
 
-[assembly: AssemblyTitle("ICSharpCode.TextEditor")]
+[assembly: AssemblyTitle("ICSharpCode.TextEditor v4.0.2.6466")]
 [assembly: AssemblyDescription("This is a GitExtensions fork of SharpDevelop .NET text editor control")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
\ No newline at end of file