diff --git a/external/Mono.Cecil.AssemblyInfo.cs b/external/Mono.Cecil.AssemblyInfo.cs
new file mode 100644
index 000000000..d0c09384c
--- /dev/null
+++ b/external/Mono.Cecil.AssemblyInfo.cs
@@ -0,0 +1,4 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo ("Xamarin.Android.Cecil.Pdb, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
+[assembly: InternalsVisibleTo ("Xamarin.Android.Cecil.Mdb, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
diff --git a/src/Xamarin.Android.Cecil/Mono.Cecil.overrides b/external/Mono.Cecil.overrides
similarity index 76%
rename from src/Xamarin.Android.Cecil/Mono.Cecil.overrides
rename to external/Mono.Cecil.overrides
index 3d5468a17..dcbc9a780 100644
--- a/src/Xamarin.Android.Cecil/Mono.Cecil.overrides
+++ b/external/Mono.Cecil.overrides
@@ -1,6 +1,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <AssemblyName>$(AssemblyName.Replace('Mono', 'Xamarin.Android'))</AssemblyName>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\product.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Mono.Cecil.AssemblyInfo.cs" />
diff --git a/external/cecil b/external/cecil
index d0cb2b783..d4bc3e722 160000
--- a/external/cecil
+++ b/external/cecil
@@ -1 +1 @@
-Subproject commit d0cb2b7838f7c893325a2c636a56968455df582b
+Subproject commit d4bc3e72257a4411afc4707d5034208a296ae56b
diff --git a/src/Xamarin.Android.Cecil/AssemblyInfo.cs b/src/Xamarin.Android.Cecil/AssemblyInfo.cs
deleted file mode 100644
index 79ef103cd..000000000
--- a/src/Xamarin.Android.Cecil/AssemblyInfo.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo ("Xamarin.Android.Cecil.Pdb, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")]
-[assembly: InternalsVisibleTo ("Xamarin.Android.Cecil.Mdb, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")]
diff --git a/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.targets b/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.targets
index 06839ae2d..e1c2fe1a8 100644
--- a/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.targets
+++ b/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.targets
@@ -8,35 +8,16 @@
     <CecilOutputPath>$([System.IO.Path]::GetFullPath ($(CecilOutputPath)))</CecilOutputPath>
     <CecilAssemblies>$(OutputPath)\Xamarin.Android.Cecil.dll;$(OutputPath)\Xamarin.Android.Cecil.Mdb.dll</CecilAssemblies>
   </PropertyGroup>
-  <Target Name="PrepareCecil"
-      Inputs="$(CecilDirectory)\Mono.Cecil.sln;AssemblyInfo.cs;Mono.Cecil.overrides;Xamarin.Android.Cecil.targets"
-      Outputs="$(CecilPreparedFlag)">
-    <Copy SourceFiles="AssemblyInfo.cs" DestinationFiles="$(CecilDirectory)\Mono.Cecil.AssemblyInfo.cs" />
-    <Copy SourceFiles="Mono.Cecil.overrides" DestinationFolder="$(CecilDirectory)" />
-    <Touch Files="$(CecilPreparedFlag)" AlwaysCreate="True" />
-  </Target>
   <Target Name="BuildCecil"
-      Inputs="$(CecilPreparedFlag)"
-      Outputs="$(CecilAssemblies)" DependsOnTargets="PrepareCecil">
-    <Exec
-        Command="patch -Ep1 &lt; &quot;$(MSBuildThisFileDirectory)\assembly-rename.patch&quot;"
-        WorkingDirectory="$(CecilDirectory)"
-    />
+      Outputs="$(CecilAssemblies)">
     <MSBuild
         Projects="$(CecilDirectory)\Mono.Cecil.csproj;$(CecilDirectory)\symbols\mdb\Mono.Cecil.Mdb.csproj"
         Targets="Clean;Build"
         StopOnFirstFailure="True"
         Properties="Configuration=net_4_0_Debug;OutputPath=$(CecilOutputPath);BuildingSolutionFile=false" />
-    <Exec
-        Command="patch -REp1 &lt; &quot;$(MSBuildThisFileDirectory)\assembly-rename.patch&quot;"
-        WorkingDirectory="$(CecilDirectory)"
-    />
     <Touch Files="$(CecilAssemblies)" />
   </Target>
   <Target Name="Build" DependsOnTargets="BuildCecil" Returns="$(CecilOutputPath)\$(AssemblyName).dll">
     <MakeDir Directories="obj\$(Configuration)" />
   </Target>
-  <Target Name="AfterClean">
-    <Delete Files="$(CecilPreparedFlag)" />
-  </Target>
 </Project>
diff --git a/src/Xamarin.Android.Cecil/assembly-rename.patch b/src/Xamarin.Android.Cecil/assembly-rename.patch
deleted file mode 100644
index 706e10080..000000000
--- a/src/Xamarin.Android.Cecil/assembly-rename.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/Mono.Cecil.Cil/Symbols.cs b/Mono.Cecil.Cil/Symbols.cs
-index 6ca158e..dbca57a 100644
---- a/Mono.Cecil.Cil/Symbols.cs
-+++ b/Mono.Cecil.Cil/Symbols.cs
-@@ -637,7 +637,7 @@ namespace Mono.Cecil.Cil {
- 			var cecil_name = typeof (SymbolProvider).GetAssembly ().GetName ();
- 
- 			var name = new SR.AssemblyName {
--				Name = "Mono.Cecil." + symbolKind,
-+				Name = "Xamarin.Android.Cecil." + symbolKind,
- 				Version = cecil_name.Version,
- 			};
- 
-diff --git a/Mono.Cecil/AssemblyInfo.cs b/Mono.Cecil/AssemblyInfo.cs
-index 4d32f2b..9726954 100644
---- a/Mono.Cecil/AssemblyInfo.cs
-+++ b/Mono.Cecil/AssemblyInfo.cs
-@@ -12,7 +12,7 @@ using System.Reflection;
- using System.Runtime.CompilerServices;
- using System.Runtime.InteropServices;
- 
--[assembly: AssemblyTitle ("Mono.Cecil")]
-+[assembly: AssemblyTitle ("Xamarin.Android.Cecil")]
- 
- #if !PCL && !NET_CORE
- [assembly: Guid ("fd225bb4-fa53-44b2-a6db-85f5e48dcb54")]
-diff --git a/ProjectInfo.cs b/ProjectInfo.cs
-index 6bfdedf..95b940c 100644
---- a/ProjectInfo.cs
-+++ b/ProjectInfo.cs
-@@ -10,7 +10,7 @@
- using System.Reflection;
- using System.Runtime.InteropServices;
- 
--[assembly: AssemblyProduct ("Mono.Cecil")]
-+[assembly: AssemblyProduct ("Xamarin.Android.Cecil")]
- [assembly: AssemblyCopyright ("Copyright © 2008 - 2015 Jb Evain")]
- 
- #if !PCL