diff --git a/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.AvalonDock.nuspec b/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.AvalonDock.nuspec
index 953cc623..258a29a2 100644
--- a/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.AvalonDock.nuspec
+++ b/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.AvalonDock.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>APD.Wpf.Xceed.AvalonDock</id>
     <version>0.0.0.0</version>
-    <title>APD Avalon Dock</title>
+    <title>APD Xceed AvalonDock</title>
     <description>Our fork of Xceed's AvalonDock. AvalonDock is a docking windows control for WPF that lets you create customizable layouts using a full featured window docking system similar to what is found in many popular integrated development environements (IDEs) such as Visual Studio.</description>
     <authors>Xceed, APD Communications</authors>
     <copyright>Xceed &amp; APD Communications</copyright>
diff --git a/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.DataGrid.nuspec b/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.DataGrid.nuspec
new file mode 100644
index 00000000..ba37ed38
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.DataGrid.nuspec
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>APD.Wpf.Xceed.DataGrid</id>
+    <version>0.0.0.0</version>
+    <title>APD Xceed DataGrid</title>
+    <description>Our fork of Xceed's DataGrid. Deliver robust apps that give your end-users a rich, fluid, high-performance experience. The only WPF datagrid with asynchronous data virtualization: your grid feels fast even with remote data sources!</description>
+    <authors>Xceed, APD Communications</authors>
+    <copyright>Xceed &amp; APD Communications</copyright>
+    <dependencies>
+      <!-- IMPORTANT: Change me if necessary after upgrading source! (Build number is defined in build definition) -->
+      <dependency id="APD.Wpf.Xceed.Toolkit" version="[3.4,3.5)" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="Src\Xceed.Wpf.DataGrid\bin\Release\PresentationFramework.Aero.dll" target="lib\net40" />
+    <file src="Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.DataGrid.dll" target="lib\net40" />
+    <file src="Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.DataGrid.pdb" target="lib\net40" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.Toolkit.nuspec b/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.Toolkit.nuspec
new file mode 100644
index 00000000..ffbd6195
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.Toolkit.nuspec
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>APD.Wpf.Xceed.Toolkit</id>
+    <version>0.0.0.0</version>
+    <title>APD Xceed Toolkit</title>
+    <description>Our fork of Xceed's Toolkit. A collection of WPF controls, components and utilities for creating next generation Windows applications. Use it to build professional looking, modern, and easy to use WPF applications. Excludes DataGrid and AvalonDock.</description>
+    <authors>Xceed, APD Communications</authors>
+    <copyright>Xceed &amp; APD Communications</copyright>
+  </metadata>
+  <files>
+    <file src="Src\Xceed.Wpf.Toolkit\bin\Release\**" target="lib\net40" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
index 06ba4a5c..00e73cbd 100644
--- a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
+++ b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
@@ -20,7 +20,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AF30F776-A0FD-4859-8C86-67091294501C}"
 	ProjectSection(SolutionItems) = preProject
 		APD.Wpf.Xceed.AvalonDock.nuspec = APD.Wpf.Xceed.AvalonDock.nuspec
+		APD.Wpf.Xceed.DataGrid.nuspec = APD.Wpf.Xceed.DataGrid.nuspec
 		APD.Wpf.Xceed.ToolKit.Full.nuspec = APD.Wpf.Xceed.ToolKit.Full.nuspec
+		APD.Wpf.Xceed.Toolkit.nuspec = APD.Wpf.Xceed.Toolkit.nuspec
 	EndProjectSection
 EndProject
 Global