diff --git a/OpenTK.nuspec b/OpenTK.nuspec
index 50db702fb8..943740d555 100644
--- a/OpenTK.nuspec
+++ b/OpenTK.nuspec
@@ -10,8 +10,8 @@
         <projectUrl>https://github.com/opentk/opentk</projectUrl>
 
         <license type="expression">MIT</license>
-        
-        <icon>icon.png</icon>
+
+        <iconUrl>https://api.nuget.org/v3-flatcontainer/opentk/3.1.0/icon</iconUrl>
 
         <description>The Open Toolkit is set of fast, low-level C# bindings for OpenGL, OpenGL ES and OpenAL. It runs on all major platforms and powers hundreds of apps, games and scientific research.</description>
 
diff --git a/build.fsx b/build.fsx
index 203e0c3107..efbd39a12b 100644
--- a/build.fsx
+++ b/build.fsx
@@ -3,8 +3,7 @@ open System.IO
 open System.Threading
 open Fake.Core
 open Fake.DotNet
-open Fake.DotNet
-open Fake.DotNet
+open Fake.DotNet.NuGet
 open Fake.IO
 
 #r "paket:
@@ -265,9 +264,10 @@ Target.create "CreateNuGetPackage" (fun _ ->
         let dir = Path.GetDirectoryName proj
         let templatePath = Path.Combine(dir, "paket")
         let oldTmplCont = File.ReadAllText templatePath
-        let newTmplCont = oldTmplCont.Insert(oldTmplCont.Length, sprintf "\nversion %s\nauthors %s\ndescription %s"
+        let newTmplCont = oldTmplCont.Insert(oldTmplCont.Length, sprintf "\nversion \n\t%s\nauthors \n\t%s\nowners \n\t%s\ndescription \n\t%s"
                 release.NugetVersion
                 (authors |> List.reduce (fun s a -> s + " " + a))
+                (authors |> List.reduce (fun s a -> s + " " + a))
                 description).Replace("#VERSION#", release.NugetVersion)
         File.WriteAllText(templatePath + ".template", newTmplCont)
         let setParams (p:Paket.PaketPackParams) =
@@ -280,6 +280,30 @@ Target.create "CreateNuGetPackage" (fun _ ->
         Paket.pack setParams
     )
 
+Target.create "CreateMetaPackage" (fun _ ->
+    let notes = release.Notes |> List.reduce (fun s1 s2 -> s1 + "\n" + s2)
+    let setParams (p:NuGet.NuGetParams) =
+        { p with
+            Version = release.NugetVersion
+            Authors = authors
+            Project = project
+//                Summary = summary
+//                Description = description
+            Copyright = copyright
+            WorkingDir = binDir
+            OutputPath = nugetDir
+//                AccessKey = myAccessKey
+            Publish = false
+            ReleaseNotes = notes
+            Tags = tags
+            Properties = [
+                "Configuration", Environment.environVarOrDefault "buildMode" "Release"
+            ]
+        }
+    Trace.logf "Creating metapackage from opentk.nuspec"
+    NuGet.NuGet setParams "opentk.nuspec"
+    )
+
 // ---------
 // Release Targets
 // ---------
@@ -337,6 +361,7 @@ open Fake.Core.TargetOperators
 //  ==> "RunAllTests"
   ==> "All"
   ==> "CreateNuGetPackage"
+  ==> "CreateMetaPackage"
   ==> "ReleaseOnNuGetGallery"
   ==> "ReleaseOnGithub"
   ==> "ReleaseOnAll"
diff --git a/props/common.props b/props/common.props
index a554b33740..19afc2baff 100644
--- a/props/common.props
+++ b/props/common.props
@@ -3,6 +3,7 @@
     <HasCommonProperties>true</HasCommonProperties>
     <LangVersion Condition="$(MSBuildProjectExtension.EndsWith('.csproj'))">7.3</LangVersion>
     <Copyright>Copyright (c) 2006 - 2018 Stefanos Apostolopoulos (stapostol@gmail.com) for the Open Toolkit library.</Copyright>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <PropertyGroup>
     <OpenTKSolutionRoot>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..))</OpenTKSolutionRoot>
diff --git a/src/OpenToolkit.Core/paket b/src/OpenToolkit.Core/paket
index 3e49d68434..edb5e327ae 100644
--- a/src/OpenToolkit.Core/paket
+++ b/src/OpenToolkit.Core/paket
@@ -2,4 +2,5 @@ type file
 id OpenToolkit.Core
 files
     bin\Release\netstandard2.0\OpenToolkit.Core.dll ==> lib\netstandard2.0
-    bin\Release\netstandard2.0\OpenToolkit.Core.xml ==> lib\netstandard2.0
\ No newline at end of file
+    bin\Release\netstandard2.0\OpenToolkit.Core.xml ==> lib\netstandard2.0 
+    bin\Release\netstandard2.0\OpenToolkit.Core.pdb ==> lib\netstandard2.0
\ No newline at end of file
diff --git a/src/OpenToolkit.Graphics/OpenToolkit.Graphics.csproj b/src/OpenToolkit.Graphics/OpenToolkit.Graphics.csproj
index 0ce6fdb10c..2ab79e49e3 100644
--- a/src/OpenToolkit.Graphics/OpenToolkit.Graphics.csproj
+++ b/src/OpenToolkit.Graphics/OpenToolkit.Graphics.csproj
@@ -24,6 +24,5 @@
 
   <Import Project="..\..\props\common.props" />
   <Import Project="..\..\props\nuget-common.props" />
-  <Import Project="..\..\props\stylecop.props" />
 
 </Project>
diff --git a/src/OpenToolkit.Graphics/paket b/src/OpenToolkit.Graphics/paket
index d770cfcabf..68ce1f4d9e 100644
--- a/src/OpenToolkit.Graphics/paket
+++ b/src/OpenToolkit.Graphics/paket
@@ -4,4 +4,6 @@ dependencies
     OpenToolkit.Core ~> #VERSION#
     OpenToolkit.Mathematics ~> #VERSION#
 files
-    bin\Release\netstandard2.0\OpenToolkit.Graphics.dll ==> lib\netstandard2.0
\ No newline at end of file
+    bin\Release\netstandard2.0\OpenToolkit.Graphics.dll ==> lib\netstandard2.0
+    bin\Release\netstandard2.0\OpenToolkit.Graphics.xml ==> lib\netstandard2.0
+    bin\Release\netstandard2.0\OpenToolkit.Graphics.pdb ==> lib\netstandard2.0
\ No newline at end of file
diff --git a/src/OpenToolkit.Input/paket b/src/OpenToolkit.Input/paket
index 3113753da8..a79653bfc8 100644
--- a/src/OpenToolkit.Input/paket
+++ b/src/OpenToolkit.Input/paket
@@ -2,4 +2,5 @@ type file
 id OpenToolkit.Input
 files
   bin\Release\netstandard2.0\OpenToolkit.Input.dll ==> lib\netstandard2.0
-  bin\Release\netstandard2.0\OpenToolkit.Input.xml ==> lib\netstandard2.0
\ No newline at end of file
+  bin\Release\netstandard2.0\OpenToolkit.Input.xml ==> lib\netstandard2.0
+  bin\Release\netstandard2.0\OpenToolkit.Input.pdb ==> lib\netstandard2.0
\ No newline at end of file
diff --git a/src/OpenToolkit.Mathematics/paket b/src/OpenToolkit.Mathematics/paket
index a90717e9b5..e38bacd5a1 100644
--- a/src/OpenToolkit.Mathematics/paket
+++ b/src/OpenToolkit.Mathematics/paket
@@ -2,4 +2,5 @@ type file
 id OpenToolkit.Mathematics
 files
   bin\Release\netstandard2.0\OpenToolkit.Mathematics.dll ==> lib\netstandard2.0
-  bin\Release\netstandard2.0\OpenToolkit.Mathematics.xml ==> lib\netstandard2.0
\ No newline at end of file
+  bin\Release\netstandard2.0\OpenToolkit.Mathematics.xml ==> lib\netstandard2.0
+  bin\Release\netstandard2.0\OpenToolkit.Mathematics.pdb ==> lib\netstandard2.0
\ No newline at end of file
diff --git a/src/OpenToolkit.Windowing.Common/paket b/src/OpenToolkit.Windowing.Common/paket
index 3fe6a17f46..678bb6289e 100644
--- a/src/OpenToolkit.Windowing.Common/paket
+++ b/src/OpenToolkit.Windowing.Common/paket
@@ -5,4 +5,5 @@ dependencies
     OpenToolkit.Mathematics ~> #VERSION#
 files
   bin\Release\netstandard2.0\OpenToolkit.Windowing.Common.dll ==> lib\netstandard2.0
-  bin\Release\netstandard2.0\OpenToolkit.Windowing.Common.xml ==> lib\netstandard2.0
\ No newline at end of file
+  bin\Release\netstandard2.0\OpenToolkit.Windowing.Common.xml ==> lib\netstandard2.0
+  bin\Release\netstandard2.0\OpenToolkit.Windowing.Common.pdb ==> lib\netstandard2.0
\ No newline at end of file
diff --git a/src/OpenToolkit.Windowing.Desktop/paket b/src/OpenToolkit.Windowing.Desktop/paket
index 84ff9484a9..bb538d52c8 100644
--- a/src/OpenToolkit.Windowing.Desktop/paket
+++ b/src/OpenToolkit.Windowing.Desktop/paket
@@ -8,5 +8,7 @@ dependencies
 files
   bin\Release\netcoreapp3.0\OpenToolkit.Windowing.Desktop.dll ==> lib\netcoreapp3.0
   bin\Release\netcoreapp3.0\OpenToolkit.Windowing.Desktop.xml ==> lib\netcoreapp3.0
+  bin\Release\netcoreapp3.0\OpenToolkit.Windowing.Desktop.pdb ==> lib\netcoreapp3.0
   bin\Release\net472\OpenToolkit.Windowing.Desktop.dll ==> lib\net472
-  bin\Release\net472\OpenToolkit.Windowing.Desktop.xml ==> lib\net472
\ No newline at end of file
+  bin\Release\net472\OpenToolkit.Windowing.Desktop.xml ==> lib\net472
+  bin\Release\net472\OpenToolkit.Windowing.Desktop.pdb ==> lib\net472
diff --git a/src/OpenToolkit.Windowing.GraphicsLibraryFramework/paket b/src/OpenToolkit.Windowing.GraphicsLibraryFramework/paket
index cb3b869975..5b143e8e66 100644
--- a/src/OpenToolkit.Windowing.GraphicsLibraryFramework/paket
+++ b/src/OpenToolkit.Windowing.GraphicsLibraryFramework/paket
@@ -6,5 +6,7 @@ dependencies
 files
   bin\Release\netcoreapp3.0\OpenToolkit.Windowing.GraphicsLibraryFramework.dll ==> lib\netcoreapp3.0
   bin\Release\netcoreapp3.0\OpenToolkit.Windowing.GraphicsLibraryFramework.xml ==> lib\netcoreapp3.0
+  bin\Release\netcoreapp3.0\OpenToolkit.Windowing.GraphicsLibraryFramework.pdb ==> lib\netcoreapp3.0
   bin\Release\net472\OpenToolkit.Windowing.GraphicsLibraryFramework.dll ==> lib\net472
-  bin\Release\net472\OpenToolkit.Windowing.GraphicsLibraryFramework.xml ==> lib\net472
\ No newline at end of file
+  bin\Release\net472\OpenToolkit.Windowing.GraphicsLibraryFramework.xml ==> lib\net472
+  bin\Release\net472\OpenToolkit.Windowing.GraphicsLibraryFramework.pdb ==> lib\net472
\ No newline at end of file