diff --git a/OBD.NET/OBD.NET.Common/OBD.NET.Common.csproj b/OBD.NET/OBD.NET.Common/OBD.NET.Common.csproj
index 36184f0..bb7a76c 100644
--- a/OBD.NET/OBD.NET.Common/OBD.NET.Common.csproj
+++ b/OBD.NET/OBD.NET.Common/OBD.NET.Common.csproj
@@ -6,14 +6,11 @@
     <Company>-</Company>
     <Product>OBD.NET</Product>
     <Description>C#-Library to read/write data from/to a car through an ELM327-/STN1170-Adapter</Description>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/OBD.NET/OBD.NET.Universal/OBD.NET.Universal.csproj b/OBD.NET/OBD.NET.Universal/OBD.NET.Universal.csproj
index 9848fca..f35a990 100644
--- a/OBD.NET/OBD.NET.Universal/OBD.NET.Universal.csproj
+++ b/OBD.NET/OBD.NET.Universal/OBD.NET.Universal.csproj
@@ -121,6 +121,9 @@
       <Name>OBD.NET.Common</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="OBD.NET.Universal.nuspec" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/OBD.NET/OBD.NET.Universal/OBD.NET.Universal.nuspec b/OBD.NET/OBD.NET.Universal/OBD.NET.Universal.nuspec
new file mode 100644
index 0000000..5fcc230
--- /dev/null
+++ b/OBD.NET/OBD.NET.Universal/OBD.NET.Universal.nuspec
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <authors>$author$</authors>
+    <owners>$author$</owners>
+    <projectUrl>https://github.com/romanlum/OBD.NET</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <releaseNotes>Initial release.</releaseNotes>
+    <copyright>Copyright 2017</copyright>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/OBD.NET/OBD.NET.Universal/Properties/AssemblyInfo.cs b/OBD.NET/OBD.NET.Universal/Properties/AssemblyInfo.cs
index 37c5a63..483f8d8 100644
--- a/OBD.NET/OBD.NET.Universal/Properties/AssemblyInfo.cs
+++ b/OBD.NET/OBD.NET.Universal/Properties/AssemblyInfo.cs
@@ -6,10 +6,10 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OBD.NET.Universal")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("C#-Library to read/write data from/to a car through an ELM327-/STN1170-Adapter on UWP")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OBD.NET.Universal")]
+[assembly: AssemblyCompany("Roman Lumetsberger")]
+[assembly: AssemblyProduct("OBD.NET")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OBD.NET/ODB.NET.Desktop/ODB.NET.Desktop.csproj b/OBD.NET/ODB.NET.Desktop/ODB.NET.Desktop.csproj
index 47674c1..cdcb7d9 100644
--- a/OBD.NET/ODB.NET.Desktop/ODB.NET.Desktop.csproj
+++ b/OBD.NET/ODB.NET.Desktop/ODB.NET.Desktop.csproj
@@ -51,5 +51,8 @@
       <Name>OBD.NET.Common</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ODB.NET.Desktop.nuspec" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/OBD.NET/ODB.NET.Desktop/ODB.NET.Desktop.nuspec b/OBD.NET/ODB.NET.Desktop/ODB.NET.Desktop.nuspec
new file mode 100644
index 0000000..4192d04
--- /dev/null
+++ b/OBD.NET/ODB.NET.Desktop/ODB.NET.Desktop.nuspec
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <authors>$author$</authors>
+    <owners>$author$</owners>
+    <projectUrl>https://github.com/romanlum/OBD.NET</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <releaseNotes>Initial release</releaseNotes>
+    <copyright>Copyright 2017</copyright>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/OBD.NET/ODB.NET.Desktop/Properties/AssemblyInfo.cs b/OBD.NET/ODB.NET.Desktop/Properties/AssemblyInfo.cs
index 0ae86dc..9d5a6e1 100644
--- a/OBD.NET/ODB.NET.Desktop/Properties/AssemblyInfo.cs
+++ b/OBD.NET/ODB.NET.Desktop/Properties/AssemblyInfo.cs
@@ -6,10 +6,10 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("ODB.NET.Desktop")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("C#-Library to read/write data from/to a car through an ELM327-/STN1170-Adapter on UWP")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ODB.NET.Desktop")]
+[assembly: AssemblyCompany("Wyrez / Roman Lumetsberger")]
+[assembly: AssemblyProduct("OBD.NET")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]