diff --git a/Genuine Channels/Sources/AssemblyInfo.cs b/Genuine Channels/Sources/AssemblyInfo.cs
index 1b9e7bf..e33afc7 100755
--- a/Genuine Channels/Sources/AssemblyInfo.cs	
+++ b/Genuine Channels/Sources/AssemblyInfo.cs	
@@ -39,8 +39,12 @@
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
+// Keep this as is until v3.0 is published, then change to "3.0.0.0"
 [assembly: AssemblyVersion("2.5.9.9")]
 
+// Keep this in sync with the Nuget package version
+[assembly: AssemblyFileVersion("2.5.9.11")]
+
 //
 // In order to sign your assembly you must specify a key to use. Refer to the
 // Microsoft .NET Framework documentation for more information on assembly signing.
diff --git a/Genuine Channels/Sources/GenuineChannels.Desktop.v3.5.csproj b/Genuine Channels/Sources/GenuineChannels.Desktop.v3.5.csproj
index 9d98645..c2c71b7 100644
--- a/Genuine Channels/Sources/GenuineChannels.Desktop.v3.5.csproj	
+++ b/Genuine Channels/Sources/GenuineChannels.Desktop.v3.5.csproj	
@@ -47,7 +47,7 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="Zyan.SafeDeserializationHelpers">
-      <HintPath>..\packages\Zyan.SafeDeserializationHelpers.0.3.0\lib\net35\Zyan.SafeDeserializationHelpers.dll</HintPath>
+      <HintPath>..\packages\Zyan.SafeDeserializationHelpers.0.5.0\lib\net35\Zyan.SafeDeserializationHelpers.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Genuine Channels/Sources/GenuineChannels.Desktop.v4.6.csproj b/Genuine Channels/Sources/GenuineChannels.Desktop.v4.6.csproj
index b18e402..412492e 100644
--- a/Genuine Channels/Sources/GenuineChannels.Desktop.v4.6.csproj	
+++ b/Genuine Channels/Sources/GenuineChannels.Desktop.v4.6.csproj	
@@ -48,7 +48,7 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="Zyan.SafeDeserializationHelpers">
-      <HintPath>..\packages\Zyan.SafeDeserializationHelpers.0.3.0\lib\net35\Zyan.SafeDeserializationHelpers.dll</HintPath>
+      <HintPath>..\packages\Zyan.SafeDeserializationHelpers.0.5.0\lib\net35\Zyan.SafeDeserializationHelpers.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Genuine Channels/Sources/packages.config b/Genuine Channels/Sources/packages.config
index f513690..6cd5a7e 100644
--- a/Genuine Channels/Sources/packages.config	
+++ b/Genuine Channels/Sources/packages.config	
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Zyan.SafeDeserializationHelpers" version="0.3.0" targetFramework="net35" />
+  <package id="Zyan.SafeDeserializationHelpers" version="0.5.0" targetFramework="net35" />
 </packages>
\ No newline at end of file
diff --git a/Genuine Channels/Tests/GenuineChannels.UnitTests.v3.5.csproj b/Genuine Channels/Tests/GenuineChannels.UnitTests.v3.5.csproj
index 9013714..9c56df6 100644
--- a/Genuine Channels/Tests/GenuineChannels.UnitTests.v3.5.csproj	
+++ b/Genuine Channels/Tests/GenuineChannels.UnitTests.v3.5.csproj	
@@ -30,7 +30,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net" />
@@ -39,7 +39,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="Zyan.SafeDeserializationHelpers">
-      <HintPath>..\packages\Zyan.SafeDeserializationHelpers.0.3.0\lib\net35\Zyan.SafeDeserializationHelpers.dll</HintPath>
+      <HintPath>..\packages\Zyan.SafeDeserializationHelpers.0.5.0\lib\net35\Zyan.SafeDeserializationHelpers.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -63,6 +63,9 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\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/Genuine Channels/Tests/GenuineChannels.UnitTests.v4.6.csproj b/Genuine Channels/Tests/GenuineChannels.UnitTests.v4.6.csproj
index 48ad70d..1bff1d1 100644
--- a/Genuine Channels/Tests/GenuineChannels.UnitTests.v4.6.csproj	
+++ b/Genuine Channels/Tests/GenuineChannels.UnitTests.v4.6.csproj	
@@ -30,7 +30,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -40,7 +40,7 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="Zyan.SafeDeserializationHelpers">
-      <HintPath>..\packages\Zyan.SafeDeserializationHelpers.0.3.0\lib\net35\Zyan.SafeDeserializationHelpers.dll</HintPath>
+      <HintPath>..\packages\Zyan.SafeDeserializationHelpers.0.5.0\lib\net35\Zyan.SafeDeserializationHelpers.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Genuine Channels/Tests/UnitTests/VulnerabilityTests.cs b/Genuine Channels/Tests/UnitTests/VulnerabilityTests.cs
index 6cf4818..02afb5e 100644
--- a/Genuine Channels/Tests/UnitTests/VulnerabilityTests.cs	
+++ b/Genuine Channels/Tests/UnitTests/VulnerabilityTests.cs	
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
+using System.Security;
 using Belikov.GenuineChannels.Security;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Zyan.SafeDeserializationHelpers;
@@ -89,7 +90,7 @@ public static object GetTypeConfuseDelegate(string cmd)
 			return set;
 		}
 
-		[TestMethod, ExpectedException(typeof(UnsafeDeserializationException))]
+		[TestMethod, ExpectedException(typeof(SecurityException))]
 		public void RemoteInvocation()
 		{
 			// note: localhost url should now work, although it may be resolved to IPv6 address
@@ -100,7 +101,7 @@ public void RemoteInvocation()
 			Assert.AreEqual("Pwned", result);
 		}
 
-		[TestMethod, ExpectedException(typeof(UnsafeDeserializationException))]
+		[TestMethod, ExpectedException(typeof(SecurityException))]
 		public void RemoteInvocationWithPostfix()
 		{
 			// note: localhost url should now work, although it may be resolved to IPv6 address
@@ -111,7 +112,7 @@ public void RemoteInvocationWithPostfix()
 			Assert.AreEqual("Pwned", result);
 		}
 
-		[TestMethod, ExpectedException(typeof(UnsafeDeserializationException))]
+		[TestMethod, ExpectedException(typeof(SecurityException))]
 		public void RemoteInvocationWithCompression()
 		{
 			// test compression
@@ -132,7 +133,7 @@ public void RemoteInvocationWithCompression()
 			}
 		}
 
-		[TestMethod, ExpectedException(typeof(UnsafeDeserializationException))]
+		[TestMethod, ExpectedException(typeof(SecurityException))]
 		public void RemoteInvocationWithCompressionAndPostfix()
 		{
 			// test compression
diff --git a/Genuine Channels/Tests/packages.config b/Genuine Channels/Tests/packages.config
index f513690..6cd5a7e 100644
--- a/Genuine Channels/Tests/packages.config	
+++ b/Genuine Channels/Tests/packages.config	
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Zyan.SafeDeserializationHelpers" version="0.3.0" targetFramework="net35" />
+  <package id="Zyan.SafeDeserializationHelpers" version="0.5.0" targetFramework="net35" />
 </packages>
\ No newline at end of file
diff --git a/Nuget/GenuineChannels.nuspec b/Nuget/GenuineChannels.nuspec
index 207a1c0..175d59b 100644
--- a/Nuget/GenuineChannels.nuspec
+++ b/Nuget/GenuineChannels.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>GenuineChannels</id>
-    <version>2.5.9.10</version>
+    <version>2.5.9.11</version>
     <authors>Dmitry Belikov, Sergey Tkachev</authors>
     <owners>yallie, rainbird</owners>
     <licenseUrl>https://raw.githubusercontent.com/zyanfx/GenuineChannels/master/LICENSE</licenseUrl>
@@ -15,22 +15,26 @@
     <releaseNotes>
     What's new:
 
+      v2.5.9.11:
+      — Fixed IPv6 host name URL encoding according to RFC 6874
+      — Fixed assembly file version resource to match the Nuget package version
+
       v2.5.9.10:
-      - IPv6 support (.NET Framework version 3.5 and 4.6 only)
-      - Optional TCP port sharing
-      - Optional TCP dual socket mode will enable both IPv4 and IPv6 for the socket listener (Vista and Longhorn above only)
-      - BinaryFormatter security fixes (dangerous delegates, unguarded DataSet and WindowsIdentity deserialization)
-      - Using built-in compression classes instead of the external ICSharpCode.SharpZipLib.dll library
-      - Dropped support for .NET Framework 3.0 and below
+      — IPv6 support (.NET Framework version 3.5 and 4.6 only)
+      — Optional TCP port sharing
+      — Optional TCP dual socket mode will enable both IPv4 and IPv6 for the socket listener (Vista and Longhorn above only)
+      — BinaryFormatter security fixes (dangerous delegates, unguarded DataSet and WindowsIdentity deserialization)
+      — Using built-in compression classes instead of the external ICSharpCode.SharpZipLib.dll library
+      — Dropped support for .NET Framework 3.0 and below
 
       v2.5.9.9:
-      - This is the initial release of the MIT-licensed open-source version of GenuineChannels.
+      — This is the initial release of the MIT-licensed open-source version of GenuineChannels.
     </releaseNotes>
     <copyright>Copyright (c) 2005-2018 Dmitry Belikov, Sergey Tkachev and Contributors</copyright>
     <tags>.net remoting duplex tcp udp shared memory channel genuine channels rpc security async compression encryption communication socket sockets nat firewall</tags>
     <dependencies>
       <group>
-        <dependency id="Zyan.SafeDeserializationHelpers" version="0.3.0" />
+        <dependency id="Zyan.SafeDeserializationHelpers" version="0.5.0" />
       </group>
     </dependencies>
   </metadata>