diff --git a/MongoDB.GridFS.Tests/AssemblyInfo.cs b/MongoDB.GridFS.Tests/AssemblyInfo.cs
index a393bb35..c11faf1c 100644
--- a/MongoDB.GridFS.Tests/AssemblyInfo.cs
+++ b/MongoDB.GridFS.Tests/AssemblyInfo.cs
@@ -1,6 +1,5 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
+using System.Reflection;
+
 // Information about this assembly is defined by the following attributes. 
 // Change them to the values specific to your project.
 
@@ -18,9 +17,3 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
diff --git a/MongoDB.GridFS.Tests/MongoDB.GridFS.Tests.csproj b/MongoDB.GridFS.Tests/MongoDB.GridFS.Tests.csproj
index 51175cfd..e7a50443 100644
--- a/MongoDB.GridFS.Tests/MongoDB.GridFS.Tests.csproj
+++ b/MongoDB.GridFS.Tests/MongoDB.GridFS.Tests.csproj
@@ -10,6 +10,8 @@
     <AssemblyName>MongoDB.GridFS.Tests</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <RootNamespace>MongoDB.GridFS.Tests</RootNamespace>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\StrongName.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,6 +47,9 @@
     <None Include="..\MongoDB.Net-Tests\App.config">
       <Link>App.config</Link>
     </None>
+    <None Include="..\StrongName.snk">
+      <Link>StrongName.snk</Link>
+    </None>
     <None Include="MongoDB.GridFS.Tests.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB.GridFS/AssemblyInfo.cs b/MongoDB.GridFS/AssemblyInfo.cs
index 65dd20a6..566dcba6 100644
--- a/MongoDB.GridFS/AssemblyInfo.cs
+++ b/MongoDB.GridFS/AssemblyInfo.cs
@@ -1,6 +1,5 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
+using System.Reflection;
+
 // Information about this assembly is defined by the following attributes. 
 // Change them to the values specific to your project.
 
@@ -18,9 +17,3 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
diff --git a/MongoDB.GridFS/MongoDB.GridFS.csproj b/MongoDB.GridFS/MongoDB.GridFS.csproj
index 44c16363..d1b341db 100644
--- a/MongoDB.GridFS/MongoDB.GridFS.csproj
+++ b/MongoDB.GridFS/MongoDB.GridFS.csproj
@@ -10,6 +10,8 @@
     <AssemblyName>MongoDB.GridFS</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <RootNamespace>MongoDB.GridFS</RootNamespace>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\StrongName.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,5 +47,10 @@
       <Name>MongoDB.Driver</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\StrongName.snk">
+      <Link>StrongName.snk</Link>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/MongoDB.Linq.Tests/MongoDB.Linq.Tests.csproj b/MongoDB.Linq.Tests/MongoDB.Linq.Tests.csproj
index 6f6828b9..06795044 100644
--- a/MongoDB.Linq.Tests/MongoDB.Linq.Tests.csproj
+++ b/MongoDB.Linq.Tests/MongoDB.Linq.Tests.csproj
@@ -12,6 +12,8 @@
     <AssemblyName>MongoDB.Linq.Tests</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\StrongName.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -75,6 +77,9 @@
     <None Include="..\MongoDB.Net-Tests\App.config">
       <Link>App.config</Link>
     </None>
+    <None Include="..\StrongName.snk">
+      <Link>StrongName.snk</Link>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/MongoDB.Linq/AssemblyInfo.cs b/MongoDB.Linq/AssemblyInfo.cs
new file mode 100644
index 00000000..163f368b
--- /dev/null
+++ b/MongoDB.Linq/AssemblyInfo.cs
@@ -0,0 +1,19 @@
+using System.Reflection;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("MongoDB.Linq")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/MongoDB.Linq/MongoDB.Linq.csproj b/MongoDB.Linq/MongoDB.Linq.csproj
index 024a200a..c49db2d8 100644
--- a/MongoDB.Linq/MongoDB.Linq.csproj
+++ b/MongoDB.Linq/MongoDB.Linq.csproj
@@ -12,6 +12,8 @@
     <AssemblyName>MongoDB.Linq</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\StrongName.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,6 +47,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
     <Compile Include="ExpressionTreeVisitor.cs" />
     <Compile Include="MongoDocumentQuery.cs" />
     <Compile Include="IMongoQuery.cs" />
@@ -53,7 +56,6 @@
     <Compile Include="MongoQuery.cs" />
     <Compile Include="MongoQueryProvider.cs" />
     <Compile Include="MongoQueryTranslator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MongoDBDriver\MongoDB.Driver.csproj">
@@ -61,6 +63,11 @@
       <Name>MongoDB.Driver</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\StrongName.snk">
+      <Link>StrongName.snk</Link>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MongoDB.Linq/Properties/AssemblyInfo.cs b/MongoDB.Linq/Properties/AssemblyInfo.cs
deleted file mode 100644
index 836f0c87..00000000
--- a/MongoDB.Linq/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MongoDB.Linq")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MongoDB.Linq")]
-[assembly: AssemblyCopyright("Copyright ©  2009")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("443b51f7-36c7-434b-9d50-2a22a2d9be44")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MongoDB.Net-Tests/MongoDB.Driver.Tests.csproj b/MongoDB.Net-Tests/MongoDB.Driver.Tests.csproj
index dfeffdfd..6ccf7bfd 100644
--- a/MongoDB.Net-Tests/MongoDB.Driver.Tests.csproj
+++ b/MongoDB.Net-Tests/MongoDB.Driver.Tests.csproj
@@ -34,6 +34,8 @@
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <NoStdLib>False</NoStdLib>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\StrongName.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -98,6 +100,9 @@
     <Compile Include="TestMongo.cs" />
     <Compile Include="IO\TestMsgMessage.cs" />
     <Compile Include="TestB.cs" />
+    <None Include="..\StrongName.snk">
+      <Link>StrongName.snk</Link>
+    </None>
     <None Include="App.config" />
     <None Include="test-data\tests.charreads.txt" />
     <None Include="test-data\tests.reads.txt" />
diff --git a/MongoDBDriver/AssemblyInfo.cs b/MongoDBDriver/AssemblyInfo.cs
index a4b017ea..a3ff432f 100644
--- a/MongoDBDriver/AssemblyInfo.cs
+++ b/MongoDBDriver/AssemblyInfo.cs
@@ -24,9 +24,6 @@
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
 
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
 [assembly: CLSCompliantAttribute(true)]
 
diff --git a/MongoDBDriver/MongoDB.Driver.csproj b/MongoDBDriver/MongoDB.Driver.csproj
index f210ea4f..1d235ceb 100644
--- a/MongoDBDriver/MongoDB.Driver.csproj
+++ b/MongoDBDriver/MongoDB.Driver.csproj
@@ -35,6 +35,8 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <RootNamespace>MongoDB.Driver</RootNamespace>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\StrongName.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -180,5 +182,10 @@
       <Visible>False</Visible>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\StrongName.snk">
+      <Link>StrongName.snk</Link>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/StrongName.snk b/StrongName.snk
new file mode 100644
index 00000000..c5dfd6e3
Binary files /dev/null and b/StrongName.snk differ