diff --git a/Directory.Build.props b/Directory.Build.props
index bc5a641246..a37097204f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -63,25 +63,29 @@
     <VersionSuffix Condition="'$(IncludeBuildNumberInPackageVersion)' == 'true'">$(VersionSuffix)-$(BuildNumberMajor)-$(BuildNumberMinor)</VersionSuffix>
   </PropertyGroup>
 
+  <!-- SourceLink properties used by dotnet/buildtools - need to be set before importing $(ToolsDir)versioning.props -->
+  <PropertyGroup>
+    <UseSourceLink>true</UseSourceLink>
+    <GitHubRepositoryName>machinelearning</GitHubRepositoryName>
+  </PropertyGroup>
+
+  <!--
+  Source code control properties used by the .NET Core SDK to inject SCC info into the NuGet package.
+  In future versions, these will be used for SourceLink and to generate AssemblyInfo.
+  -->
+  <PropertyGroup>
+    <PrivateRepositoryUrl>https://github.com/dotnet/$(GitHubRepositoryName)</PrivateRepositoryUrl>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <SourceRevisionId>$(LatestCommit)</SourceRevisionId>
+  </PropertyGroup>
+
   <!--
   Ensure to import versioning.props before overwriting BaseIntermediateOutputPath since
   the source link file exists in the root bin/obj folder.
    -->
   <Import Project="$(ToolsDir)versioning.props" 
           Condition="Exists('$(ToolsDir)versioning.props') and '$(DisableImportVersioningProps)' != 'true'" />
-
-  <!-- NuGet package properties -->
-  <PropertyGroup>
-    <Authors>Microsoft</Authors>
-    <IncludeSymbols>true</IncludeSymbols>
-  </PropertyGroup>
-
-  <!-- SourceLink properties -->
-  <PropertyGroup>
-    <UseSourceLink>true</UseSourceLink>
-    <GitHubRepositoryName>machinelearning</GitHubRepositoryName>
-  </PropertyGroup>
-  
+ 
   <!-- Language configuration -->
   <PropertyGroup>
     <LangVersion>latest</LangVersion> <!-- default to allowing all language features -->
diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
index 631f75088e..3e905b7328 100644
--- a/Microsoft.ML.sln
+++ b/Microsoft.ML.sln
@@ -85,6 +85,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "specs", "specs", "{2DEFC784
 		Documentation\specs\mvp.md = Documentation\specs\mvp.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{D3D38B03-B557-484D-8348-8BADEE4DF592}"
+	ProjectSection(SolutionItems) = preProject
+		pkg\Directory.Build.props = pkg\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML", "Microsoft.ML", "{DEC8F776-49F7-4D87-836C-FE4DC057D08C}"
+	ProjectSection(SolutionItems) = preProject
+		pkg\Microsoft.ML\Microsoft.ML.nupkgproj = pkg\Microsoft.ML\Microsoft.ML.nupkgproj
+		pkg\Microsoft.ML\Microsoft.ML.symbols.nupkgproj = pkg\Microsoft.ML\Microsoft.ML.symbols.nupkgproj
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Parquet", "Microsoft.ML.Parquet", "{6C95FC87-F5F2-4EEF-BB97-567F2F5DD141}"
+	ProjectSection(SolutionItems) = preProject
+		pkg\Microsoft.ML.Parquet\Microsoft.ML.Parquet.nupkgproj = pkg\Microsoft.ML.Parquet\Microsoft.ML.Parquet.nupkgproj
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -210,6 +226,8 @@ Global
 		{52794B40-AB8A-41AF-9EF7-799C80D6E0BC} = {E20AF96D-3F66-4065-8A89-BEE479D74536}
 		{DB751004-5D49-4B88-B78F-29CA9887087D} = {E20AF96D-3F66-4065-8A89-BEE479D74536}
 		{2DEFC784-F2B5-44EA-ABBB-0DCF3E689DAC} = {E20AF96D-3F66-4065-8A89-BEE479D74536}
+		{DEC8F776-49F7-4D87-836C-FE4DC057D08C} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
+		{6C95FC87-F5F2-4EEF-BB97-567F2F5DD141} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
diff --git a/pkg/Directory.Build.props b/pkg/Directory.Build.props
index 34ddf4281d..ff9271e73f 100644
--- a/pkg/Directory.Build.props
+++ b/pkg/Directory.Build.props
@@ -5,6 +5,23 @@
     <NoBuild>true</NoBuild>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
+
+    <!--
+    Our .nupkgproj files have conflicting names with src projects, which puts their intermediate
+    output in the same folder (like project.assets.json). Override the intermediate output to
+    make it unique for the .nupkgprojs.
+    -->
+    <IntermediateOutputPath>$(IntermediateOutputRootPath)$(MSBuildProjectName).NupkgProj\</IntermediateOutputPath>
+    <BaseIntermediateOutputPath>$(IntermediateOutputPath)</BaseIntermediateOutputPath>
+  </PropertyGroup>
+
+  <!-- nuspec properties -->
+  <PropertyGroup>
+    <Authors>Microsoft</Authors>
+    <PackageLicenseUrl>https://github.com/dotnet/machinelearning/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://dot.net/ml</PackageProjectUrl>
+    <PackageIconUrl>https://aka.ms/mlnetlogo</PackageIconUrl>
+    <PackageReleaseNotes>https://github.com/dotnet/machinelearning/tree/master/Documentation/release-notes</PackageReleaseNotes>
   </PropertyGroup>
 
   <!-- Work around https://github.com/NuGet/Home/issues/6091 -->
diff --git a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj b/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj
index 03a15f830f..fb73fd2230 100644
--- a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj
+++ b/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <NoBuild>true</NoBuild>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <PackageDescription>ML.NET components for Apache Parquet support.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/pkg/Microsoft.ML/Microsoft.ML.nupkgproj b/pkg/Microsoft.ML/Microsoft.ML.nupkgproj
index f2a873a6df..651f48da97 100644
--- a/pkg/Microsoft.ML/Microsoft.ML.nupkgproj
+++ b/pkg/Microsoft.ML/Microsoft.ML.nupkgproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageDescription>ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>