diff --git a/src/.nuget/NuGet.exe b/src/.nuget/NuGet.exe
index 8f6134029..9cba6edbf 100644
Binary files a/src/.nuget/NuGet.exe and b/src/.nuget/NuGet.exe differ
diff --git a/src/.nuget/NuGet.targets b/src/.nuget/NuGet.targets
index 83fe90601..b5f6e5e15 100644
--- a/src/.nuget/NuGet.targets
+++ b/src/.nuget/NuGet.targets
@@ -28,14 +28,29 @@
     <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
         <!-- Windows specific commands -->
         <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
-        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
     </PropertyGroup>
     
     <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
         <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
         <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
-        <PackagesConfig>packages.config</PackagesConfig>
     </PropertyGroup>
+
+    <PropertyGroup>
+        <PackagesProjectConfig>packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
+    </PropertyGroup>
+
+    <Choose>
+        <When Condition="Exists('$(PackagesProjectConfig)')">
+            <PropertyGroup>
+                <PackagesConfig>$(PackagesProjectConfig)</PackagesConfig>
+            </PropertyGroup>
+        </When>
+        <When Condition="Exists('packages.config')">
+            <PropertyGroup>
+                <PackagesConfig>packages.config</PackagesConfig>
+            </PropertyGroup>
+        </When>
+    </Choose>
     
     <PropertyGroup>
         <!-- NuGet command -->
diff --git a/src/corelib/corelib.v3.5.csproj b/src/corelib/corelib.v3.5.csproj
index 31828ab72..2d1f6a89c 100644
--- a/src/corelib/corelib.v3.5.csproj
+++ b/src/corelib/corelib.v3.5.csproj
@@ -635,7 +635,7 @@
       <Link>openstacknetsdk.snk</Link>
     </None>
     <None Include="corelib.nuspec" />
-    <None Include="packages.config" />
+    <None Include="packages.corelib.v3.5.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Icons\openstack_net_logo.png" />
diff --git a/src/corelib/corelib.v4.0.csproj b/src/corelib/corelib.v4.0.csproj
index bf079ca75..c9d14d9e7 100644
--- a/src/corelib/corelib.v4.0.csproj
+++ b/src/corelib/corelib.v4.0.csproj
@@ -625,7 +625,7 @@
       <Link>openstacknetsdk.snk</Link>
     </None>
     <None Include="corelib.nuspec" />
-    <None Include="packages.config" />
+    <None Include="packages.corelib.v4.0.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Icons\openstack_net_logo.png" />
diff --git a/src/corelib/packages.config b/src/corelib/packages.corelib.v3.5.config
similarity index 91%
rename from src/corelib/packages.config
rename to src/corelib/packages.corelib.v3.5.config
index 7f3386423..552fc5ffe 100644
--- a/src/corelib/packages.config
+++ b/src/corelib/packages.corelib.v3.5.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40" />
-  <package id="SimpleRESTServices" version="1.3.0.1" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net35" />
+  <package id="SimpleRESTServices" version="1.3.0.1" targetFramework="net35" />
   <package id="TaskParallelLibrary" version="1.0.2856.0" targetFramework="net35" />
 </packages>
\ No newline at end of file
diff --git a/src/corelib/packages.corelib.v4.0.config b/src/corelib/packages.corelib.v4.0.config
new file mode 100644
index 000000000..bfa7bc243
--- /dev/null
+++ b/src/corelib/packages.corelib.v4.0.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40" />
+  <package id="SimpleRESTServices" version="1.3.0.1" targetFramework="net40" />
+</packages>
\ No newline at end of file