diff --git a/CefSharp3.sln b/CefSharp3.sln
index 53328afa65..e4cf3bf73d 100644
--- a/CefSharp3.sln
+++ b/CefSharp3.sln
@@ -17,7 +17,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{47D0DC8C-D707-4D8A-A578-7737AA9CE79B}"
 	ProjectSection(SolutionItems) = preProject
 		CefSharp.props = CefSharp.props
-		NuGet\CefSharp.Wpf.nuspec = NuGet\CefSharp.Wpf.nuspec
 		ChangeLog.md = ChangeLog.md
 		LICENSE = LICENSE
 		README.md = README.md
@@ -34,6 +33,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefSharp.WinForms", "CefSha
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefSharp.WinForms.Example", "CefSharp.WinForms.Example\CefSharp.WinForms.Example.csproj", "{C043FFF7-5F71-4FFC-989A-E09E18548589}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{A23AA466-1903-44F2-946D-25AD0500D56B}"
+	ProjectSection(SolutionItems) = preProject
+		NuGet\CefSharp.Core.nuspec = NuGet\CefSharp.Core.nuspec
+		NuGet\CefSharp.Core.props = NuGet\CefSharp.Core.props
+		NuGet\CefSharp.Core.targets = NuGet\CefSharp.Core.targets
+		NuGet\CefSharp.DevTools.nuspec = NuGet\CefSharp.DevTools.nuspec
+		NuGet\CefSharp.Locales.nuspec = NuGet\CefSharp.Locales.nuspec
+		NuGet\CefSharp.Multimedia.nuspec = NuGet\CefSharp.Multimedia.nuspec
+		NuGet\CefSharp.WinForms.nuspec = NuGet\CefSharp.WinForms.nuspec
+		NuGet\CefSharp.Wpf.nuspec = NuGet\CefSharp.Wpf.nuspec
+		NuGet\CefSharp.Wpf.props = NuGet\CefSharp.Wpf.props
+		NuGet\pack.bat = NuGet\pack.bat
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -110,4 +123,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{A23AA466-1903-44F2-946D-25AD0500D56B} = {47D0DC8C-D707-4D8A-A578-7737AA9CE79B}
+	EndGlobalSection
 EndGlobal
diff --git a/NuGet/CefSharp.Core.nuspec b/NuGet/CefSharp.Core.nuspec
new file mode 100644
index 0000000000..f252929495
--- /dev/null
+++ b/NuGet/CefSharp.Core.nuspec
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>CefSharp.Core</id>
+    <version>$version$</version>
+    <authors>The CefSharp Authors</authors>
+    <owners>The CefSharp Authors</owners>
+    <projectUrl>https://github.com/cefsharp/cefsharp</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>The CefSharp Chromium-based browser component (Core components, needed by both WPF and WinForms).</description>
+    <tags>chrome browser</tags>
+    <copyright>Copyright © 2010-2013 The CefSharp Authors</copyright>
+  </metadata>
+  <files>
+    <!-- CEF/Chromium files -->
+    <file src="..\CEF\Win32\icudt.dll" target="CEF\x86" />
+    <file src="..\CEF\x64\icudt.dll" target="CEF\x64" />
+    <file src="..\CEF\Win32\libcef.dll" target="CEF\x86"/>
+    <file src="..\CEF\x64\libcef.dll" target="CEF\x64"/>
+    <file src="..\CEF\locales\en-US.pak" target="CEF\locales"/>
+
+    <!-- Common CefSharp stuff (shared between both WPF and WinForms) -->
+    <file src="..\Win32\Release\CefSharp.dll" target="CefSharp\x86"/>
+    <file src="..\x64\Release\CefSharp.dll" target="CefSharp\x64"/>
+    <file src="..\CefSharp.BrowserSubprocess\bin\x86\Release\CefSharp.BrowserSubprocess.exe" target="CefSharp\x86"/>
+    <file src="..\CefSharp.BrowserSubprocess\bin\x64\Release\CefSharp.BrowserSubprocess.exe" target="CefSharp\x64"/>
+
+    <file src="CefSharp.Core.props" target="build" />
+    <file src="CefSharp.Core.targets" target="build" />
+  </files>
+</package>
diff --git a/NuGet/CefSharp.Wpf.nuspec b/NuGet/CefSharp.Wpf.nuspec
index 51f71019d6..737fd0867d 100644
--- a/NuGet/CefSharp.Wpf.nuspec
+++ b/NuGet/CefSharp.Wpf.nuspec
@@ -3,37 +3,23 @@
   <metadata>
     <id>CefSharp.Wpf</id>
     <version>$version$</version>
-    <authors>CefSharp community</authors>
-    <owners>CefSharp community</owners>
-    <projectUrl>https://github.com/perlun/cefsharp</projectUrl>
+    <authors>The CefSharp Authors</authors>
+    <owners>The CefSharp Authors</owners>
+    <projectUrl>https://github.com/cefsharp/cefsharp</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>The CefSharp Chromium-based browser component (WPF version).</description>
+    <description>The CefSharp Chromium-based browser component (WPF control).</description>
     <tags>wpf chrome browser</tags>
-  <copyright>Copyright © 2013 Per Lundberg, Anthony Taranto and others</copyright>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System.ComponentModel.DataAnnotations" />
-      <frameworkAssembly assemblyName="System.Windows.Browser" targetFramework="sl50" />
-      <frameworkAssembly assemblyName="System.Windows.Controls" targetFramework="sl50" />
-      <frameworkAssembly assemblyName="System.Windows.Controls.Navigation" targetFramework="sl50" />
-    </frameworkAssemblies>
+    <copyright>Copyright © 2010-2013 The CefSharp Authors</copyright>
+    <dependencies>
+      <dependency id="CefSharp.Core" version="[$version$]" />
+    </dependencies>
   </metadata>
   <files>
-    <!-- CefSharp files -->
-    <file src="..\Release\CefSharp.dll" target="lib\net40"/>
-    <file src="..\Release\CefSharp.Wpf.dll" target="lib\net40"/>
+    <!-- Cannot put these inside lib\net40 etc, since there are both x86 and x64 versions which we must distinguish between. We
+         solve this using a .props file instead. -->
+    <file src="..\CefSharp.Wpf\bin\x86\Release\CefSharp.Wpf.dll" target="CefSharp\x86" />
+    <file src="..\CefSharp.Wpf\bin\x64\Release\CefSharp.Wpf.dll" target="CefSharp\x64" />
 
-    <!-- CEF/Chromium files -->
-    <file src="..\Release\avcodec-54.dll" target="content\bin\Debug"/>
-    <file src="..\Release\avformat-54.dll" target="content\bin\Debug"/>
-    <file src="..\Release\avutil-51.dll" target="content\bin\Debug"/>
-    <file src="..\Release\icudt.dll" target="content\bin\Debug"/>
-    <file src="..\Release\libcef.dll" target="content\bin\Debug"/>
-    <file src="..\Release\libcef.dll" target="content\bin\Debug"/>
-    <file src="..\Release\libEGL.dll" target="content\bin\Debug"/>
-    <file src="..\Release\libGLESv2.dll" target="content\bin\Debug"/>
-    <file src="..\Release\devtools_resources.pak" target="content\bin\Debug\devtools_resources.pak"/>
-
-    <!-- Only including en-US for now -->
-    <file src="..\Release\locales\en-US.pak" target="content\bin\Debug\locales"/>
+    <file src="CefSharp.Wpf.props" target="build" />
   </files>
 </package>
diff --git a/NuGet/CefSharp.Wpf.props b/NuGet/CefSharp.Wpf.props
new file mode 100644
index 0000000000..ed206ec0b7
--- /dev/null
+++ b/NuGet/CefSharp.Wpf.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Reference Condition="'$(Platform)' == 'x86'"
+             Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Wpf.dll" />
+
+    <Reference Condition="'$(Platform)' == 'x64'"
+               Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.Wpf.dll" />
+  </ItemGroup>
+</Project>
diff --git a/NuGet/pack.bat b/NuGet/pack.bat
new file mode 100644
index 0000000000..337e4d2afd
--- /dev/null
+++ b/NuGet/pack.bat
@@ -0,0 +1,3 @@
+set version=3.29.0-pre0
+NuGet pack CefSharp.Core.nuspec -NoPackageAnalysis -Version %version%
+NuGet pack CefSharp.Wpf.nuspec -NoPackageAnalysis -Version %version%