diff --git a/LICENSE b/LICENSE
index 79707ec..1d027dd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,8 @@
+https://github.com/c80k/capnproto-dotnetcore/blob/master/LICENSE
+
 MIT License
 
-Copyright (c) 2019 c80k
+Copyright (c) 2019 c80k and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/chocolatey/VERIFICATION b/chocolatey/VERIFICATION
index 999a956..995ab7c 100644
--- a/chocolatey/VERIFICATION
+++ b/chocolatey/VERIFICATION
@@ -2,5 +2,6 @@ VERIFICATION
 Verification is intended to assist the Chocolatey moderators and community
 in verifying that this package's contents are trustworthy.
  
-This package is published by the capnproto-dotnetcore project itself. Any binaries will be 
-identical to other package types published by the project.
\ No newline at end of file
+This package is published by the capnproto-dotnetcore project itself. 
+To reproduce this package, obtain the sources from GitHub and execute scripts\capnpc-csharp-pack.ps1 
+The script will generate the exact NuGet package(s) which are to be pushed to Chocolatey.
diff --git a/chocolatey/capnpc-csharp-win-x86/capnpc-csharp-win-x86.nuspec b/chocolatey/capnpc-csharp-win-x86/capnpc-csharp-win-x86.nuspec
index cda2546..c3ecf05 100644
--- a/chocolatey/capnpc-csharp-win-x86/capnpc-csharp-win-x86.nuspec
+++ b/chocolatey/capnpc-csharp-win-x86/capnpc-csharp-win-x86.nuspec
@@ -5,16 +5,20 @@
     <version>1.0.0</version>
     <packageSourceUrl>https://chocolatey.org/packages/capnpc-csharp-win-x86/1.0.0</packageSourceUrl>
     <authors>Christian Köllner and contributors</authors>
-    <owners>Christian Köllner and contributors</owners>
+    <owners>Christian Köllner</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <!--<license type="expression">MIT</license>-->
-    <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
+    <licenseUrl>https://github.com/c80k/capnproto-dotnetcore/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://github.com/c80k/capnproto-dotnetcore</projectUrl>
     <title>capnpc-csharp (Install)</title>
     <description>Cap'n Proto C# code generator backend, self-contained Windows x86</description>
     <copyright>Christian Köllner and contributors</copyright>
+    <projectSourceUrl>https://github.com/c80k/capnproto-dotnetcore</projectSourceUrl>
+    <docsUrl>https://github.com/c80k/capnproto-dotnetcore/wiki</docsUrl>
+    <bugTrackerUrl>https://github.com/c80k/capnproto-dotnetcore/issues</bugTrackerUrl>
     <tags>capnp capnpc RPC serialization cerealization</tags>
-    <summary>Cap'n Proto C# code generator backend, self-contained Windows x86</summary>
+    <summary>Cap'n Proto C# code generator backend. This is the self-contained variant. It requires Windows x86/x64 
+    (as opposed to the capnpc-csharp package, which is CPU-independent but requires a .NET Core runtime)</summary>
     <!--<repository type="Git" />-->
     <dependencies>
         <dependency id="capnproto" version="0.7.0" />
@@ -25,6 +29,6 @@
     <file src="chocolateyuninstall.ps1" target="tools" />
     <file src="..\..\LICENSE" target="tools\LICENSE" />
     <file src="..\VERIFICATION" target="tools\VERIFICATION" />
-    <file src=".\bin\**" target="tools" />
+    <file src=".\bin\**" target="bin" />
   </files>
 </package>
\ No newline at end of file
diff --git a/chocolatey/capnpc-csharp-win-x86/chocolateyinstall.ps1 b/chocolatey/capnpc-csharp-win-x86/chocolateyinstall.ps1
index 025b147..0a6db46 100644
--- a/chocolatey/capnpc-csharp-win-x86/chocolateyinstall.ps1
+++ b/chocolatey/capnpc-csharp-win-x86/chocolateyinstall.ps1
@@ -1,5 +1,5 @@
 $ErrorActionPreference = 'Stop'
 
-$toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
+$binDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)\..\bin"
 
-Install-Binfile -Name capnpc-csharp -Path "$toolsDir\capnpc-csharp.exe"
+Install-Binfile -Name capnpc-csharp -Path "$binDir\capnpc-csharp.exe"
diff --git a/chocolatey/capnpc-csharp/capnpc-csharp.nuspec b/chocolatey/capnpc-csharp/capnpc-csharp.nuspec
index 89d81e4..c0a06eb 100644
--- a/chocolatey/capnpc-csharp/capnpc-csharp.nuspec
+++ b/chocolatey/capnpc-csharp/capnpc-csharp.nuspec
@@ -5,26 +5,31 @@
     <version>1.0.0</version>
     <packageSourceUrl>https://chocolatey.org/packages/capnpc-csharp/1.0.0</packageSourceUrl>
     <authors>Christian Köllner and contributors</authors>
-    <owners>Christian Köllner and contributors</owners>
+    <owners>Christian Köllner</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <!--<license type="expression">MIT</license>-->
-    <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
+    <licenseUrl>https://github.com/c80k/capnproto-dotnetcore/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://github.com/c80k/capnproto-dotnetcore</projectUrl>
     <title>capnpc-csharp (Install)</title>
     <description>Cap'n Proto C# code generator backend, portable .NET Core 2.1</description>
-    <summary>Cap'n Proto C# code generator backend, portable .NET Core 2.1</summary>
+    <summary>Cap'n Proto C# code generator backend. This is the portable variant which depends on .NET Core 2.1 (as opposed to capnpc-csharp-win-x86)</summary>
     <copyright>Christian Köllner and contributors</copyright>
+    <projectSourceUrl>https://github.com/c80k/capnproto-dotnetcore</projectSourceUrl>
+    <docsUrl>https://github.com/c80k/capnproto-dotnetcore/wiki</docsUrl>
+    <bugTrackerUrl>https://github.com/c80k/capnproto-dotnetcore/issues</bugTrackerUrl>
     <tags>capnp capnpc RPC serialization cerealization</tags>
     <!--<repository type="Git" />-->
     <dependencies>
         <dependency id="capnproto" version="0.7.0" />
+        <dependency id="dotnetcore-runtime.install" version="2.1.6" />
     </dependencies>
   </metadata>
 <files>
     <file src="chocolateyinstall.ps1" target="tools" />
     <file src="chocolateyuninstall.ps1" target="tools" />
+    <file src=".\capnpc-csharp.ps1" target="tools" />
     <file src="..\..\LICENSE" target="tools\LICENSE" />
     <file src="..\VERIFICATION" target="tools\VERIFICATION" />
-    <file src=".\bin\**" target="tools" />
+    <file src=".\bin\**" target="bin" />
   </files>
 </package>
\ No newline at end of file
diff --git a/chocolatey/capnpc-csharp/capnpc-csharp.ps1 b/chocolatey/capnpc-csharp/capnpc-csharp.ps1
new file mode 100644
index 0000000..1ef65e0
--- /dev/null
+++ b/chocolatey/capnpc-csharp/capnpc-csharp.ps1
@@ -0,0 +1,2 @@
+$myDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+dotnet "$myDir\..\bin\capnpc-csharp.dll"
diff --git a/chocolatey/capnpc-csharp/chocolateyinstall.ps1 b/chocolatey/capnpc-csharp/chocolateyinstall.ps1
index cc77a2d..c413612 100644
--- a/chocolatey/capnpc-csharp/chocolateyinstall.ps1
+++ b/chocolatey/capnpc-csharp/chocolateyinstall.ps1
@@ -2,4 +2,4 @@ $ErrorActionPreference = 'Stop'
 
 $toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
 
-Install-Binfile -Name capnpc-csharp -Path "dotnet" -Command "$toolsDir\capnpc-csharp.dll"
\ No newline at end of file
+Install-ChocolateyPowershellCommand -PackageName 'capnpc-csharp' -PsFileFullPath "$toolsDir\capnpc-csharp.ps1"
diff --git a/chocolatey/capnpc-csharp/chocolateyuninstall.ps1 b/chocolatey/capnpc-csharp/chocolateyuninstall.ps1
index e327e42..40af84f 100644
--- a/chocolatey/capnpc-csharp/chocolateyuninstall.ps1
+++ b/chocolatey/capnpc-csharp/chocolateyuninstall.ps1
@@ -1,3 +1 @@
 $ErrorActionPreference = 'Stop'
-
-Uninstall-BinFile capnpc-sharp
\ No newline at end of file
diff --git a/scripts/capnpc-csharp-install-win-x86.ps1 b/scripts/capnpc-csharp-install-win-x86.ps1
index 9d85b58..760be81 100644
--- a/scripts/capnpc-csharp-install-win-x86.ps1
+++ b/scripts/capnpc-csharp-install-win-x86.ps1
@@ -6,3 +6,5 @@ $installDir = "$scriptDir\..\chocolatey\install"
 if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")) { Start-Process powershell.exe "-NoProfile -ExecutionPolicy Bypass -File `"$PSCommandPath`"" -Verb RunAs; exit }
 
 choco install $id -s $installDir --force
+
+Pause
\ No newline at end of file
diff --git a/scripts/capnpc-csharp-install.ps1 b/scripts/capnpc-csharp-install.ps1
index cb04d34..adf0006 100644
--- a/scripts/capnpc-csharp-install.ps1
+++ b/scripts/capnpc-csharp-install.ps1
@@ -5,4 +5,6 @@ $installDir = "$scriptDir\..\chocolatey\install"
 
 if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")) { Start-Process powershell.exe "-NoProfile -ExecutionPolicy Bypass -File `"$PSCommandPath`"" -Verb RunAs; exit }
 
-choco install $id -s $installDir --force
+choco install $id --source="'$installDir;https://chocolatey.org/api/v2'" --force
+
+Pause
\ No newline at end of file