diff --git a/AUTHORS.md b/AUTHORS.md
index 27aae63f4..ba954b47d 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -27,9 +27,10 @@
 -   David Lechner ([@dlech](https://github.com/dlech))
 -   Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
 -   He-chien Tsai ([@t3476](https://github.com/t3476))
--   Ivan Cronyn ([@cronan](https://github.com/cronan))
+-   Inna Wiesel ([@inna-w](https://github.com/inna-w))
+-   Ivan Cronyn ([@cronan](https://github.com/cronan))
 -   Jan Krivanek ([@jakrivan](https://github.com/jakrivan))
--   Jeff Reback ([@jreback](https://github.com/jreback))
+-   Jeff Reback ([@jreback](https://github.com/jreback))
 -   Joe Frayne ([@jfrayne](https://github.com/jfrayne))
 -   John Burnett ([@johnburnett](https://github.com/johnburnett))
 -   John Wilkes ([@jbw3](https://github.com/jbw3))
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2d276e51..b5531bf47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 
 ### Added
 
+-   Added automatic NuGet package generation in appveyor and local builds
+
 ### Changed
 
 ### Fixed
diff --git a/appveyor.yml b/appveyor.yml
index 74b9a9c8e..445f9bb5a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -72,6 +72,7 @@ on_finish:
 
 artifacts:
   - path: dist\*
+  - path: '.\src\runtime\bin\*.nupkg'
 
 notifications:
   - provider: Slack
diff --git a/setup.py b/setup.py
index 8528753b0..53c7f3f67 100644
--- a/setup.py
+++ b/setup.py
@@ -334,6 +334,7 @@ def build_extension(self, ext):
             ),
             '/p:PythonBuildDir="{}"'.format(os.path.abspath(dest_dir)),
             '/p:PythonInteropFile="{}"'.format(os.path.basename(interop_file)),
+            "/p:PackageId=pythonnet_py{0}{1}_{2}".format(PY_MAJOR, PY_MINOR, ARCH),
             "/verbosity:{}".format(VERBOSITY),
         ]
 
diff --git a/src/runtime/Python.Runtime.15.csproj b/src/runtime/Python.Runtime.15.csproj
index fb0020356..a4d1773f7 100644
--- a/src/runtime/Python.Runtime.15.csproj
+++ b/src/runtime/Python.Runtime.15.csproj
@@ -7,14 +7,21 @@
     <AssetTargetFallback Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">net45</AssetTargetFallback>
     <RootNamespace>Python.Runtime</RootNamespace>
     <AssemblyName>Python.Runtime</AssemblyName>
-    <PackageId>Python.Runtime</PackageId>
+    <PackageId>pythonnet</PackageId>
     <VersionPrefix>2.4.1</VersionPrefix>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <title>Codestin Search App</title>
+    <Copyright>Copyright (c) 2006-2019 the contributors of the 'Python for .NET' project</Copyright>
+    <Description>Python and CLR (.NET and Mono) cross-platform language interop</Description>
+    <Authors>pythonnet</Authors>
+    <PackageLicenseUrl>https://github.com/pythonnet/pythonnet/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/pythonnet/pythonnet</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <!--<PackageReleaseNotes>https://github.com/pythonnet/pythonnet/releases/tag/v2.4.0</PackageReleaseNotes>-->
+    <PackageTags>python interop dynamic dlr Mono pinvoke</PackageTags>
+    <PackageIconUrl>https://raw.githubusercontent.com/pythonnet/pythonnet/master/src/console/python-clear.ico</PackageIconUrl>
+    <PackageProjectUrl>https://pythonnet.github.io/</PackageProjectUrl>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath Condition="'$(TargetFramework)'=='net40'">false</AppendTargetFrameworkToOutputPath>
     <DocumentationFile Condition="'$(TargetFramework)'=='net40'">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>