diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj
index 0477142..6485caf 100644
--- a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj
+++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj
@@ -7,7 +7,8 @@
     <RootNamespace>DocumentationAnalyzers</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <IncludeSymbols>true</IncludeSymbols>
-    <NuspecFile>DocumentationAnalyzers.nuspec</NuspecFile>
+    <NuspecFile Condition="'$(MetadataPackage)' != 'true'">DocumentationAnalyzers.nuspec</NuspecFile>
+    <NuspecFile Condition="'$(MetadataPackage)' == 'true'">DocumentationAnalyzers.Metadata.nuspec</NuspecFile>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -49,7 +50,32 @@
 
   <Target Name="SetNuspecProperties" AfterTargets="GetBuildVersion">
     <PropertyGroup>
-      <NuspecProperties>configuration=$(Configuration);version=$(PackageVersion)</NuspecProperties>
+      <BaseNuspecId>DotNetAnalyzers.DocumentationAnalyzers</BaseNuspecId>
+      <ImplementationNuspecId>$(BaseNuspecId)</ImplementationNuspecId>
+      <MetadataNuspecId>$(BaseNuspecId)</MetadataNuspecId>
+
+      <ImplementationNuspecId Condition="'$(PrereleaseVersion)' != ''">$(BaseNuspecId).Unstable</ImplementationNuspecId>
+      <MetadataNuspecId Condition="'$(PrereleaseVersion)' == ''">$(BaseNuspecId).Unstable</MetadataNuspecId>
+
+      <NuspecId Condition="'$(MetadataPackage)' != 'true'">$(ImplementationNuspecId)</NuspecId>
+      <NuspecId Condition="'$(MetadataPackage)' == 'true'">$(MetadataNuspecId)</NuspecId>
+
+      <NuspecUnstableVersion>$(AssemblyVersion)</NuspecUnstableVersion>
+      <NuspecStableVersion>$(PackageVersion)</NuspecStableVersion>
+
+      <NuspecVersion Condition="'$(MetadataPackage)' != 'true'">$(NuspecUnstableVersion)</NuspecVersion>
+      <NuspecVersion Condition="'$(MetadataPackage)' == 'true'">$(NuspecStableVersion)</NuspecVersion>
+
+      <ImplementationNuspecVersion Condition="'$(PrereleaseVersion)' != ''">$(NuspecUnstableVersion)</ImplementationNuspecVersion>
+      <ImplementationNuspecVersion Condition="'$(PrereleaseVersion)' == ''">$(NuspecStableVersion)</ImplementationNuspecVersion>
+
+      <NuspecProperties>id=$(NuspecId);configuration=$(Configuration);GitCommitIdShort=$(GitCommitIdShort);version=$(NuspecVersion);implId=$(ImplementationNuspecId);implVersion=$(ImplementationNuspecVersion)</NuspecProperties>
     </PropertyGroup>
   </Target>
+
+  <Target Name="PackMetadata" AfterTargets="Pack" Condition="'$(MetadataPackage)' != 'true'">
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+             Targets="Pack"
+             Properties="MetadataPackage=true;IncludeSymbols=false" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec
new file mode 100644
index 0000000..bdfc455
--- /dev/null
+++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<package>
+  <metadata minClientVersion="2.7">
+    <id>$id$</id>
+    <version>0.0.0</version>
+    <title>$id$</title>
+    <authors>Sam Harwell et. al.</authors>
+    <owners>Sam Harwell</owners>
+    <licenseUrl>https://raw.githubusercontent.com/DotNetAnalyzers/DocumentationAnalyzers/$GitCommitIdShort$/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/DotNetAnalyzers/DocumentationAnalyzers</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>An implementation of .NET documentation rules using Roslyn analyzers and code fixes</description>
+    <releaseNotes>https://github.com/DotNetAnalyzers/DocumentationAnalyzers/releases/$version$</releaseNotes>
+    <copyright>Copyright 2018 Tunnel Vision Laboratories, LLC</copyright>
+    <tags>Documentation DotNetAnalyzers Roslyn Diagnostic Analyzer</tags>
+    <developmentDependency>true</developmentDependency>
+    <dependencies>
+      <dependency id="$implId$" version="$implVersion$"/>
+    </dependencies>
+  </metadata>
+  <files>
+
+    <!-- Additional Files -->
+    <file src="..\..\LICENSE" />
+    <file src="..\..\THIRD-PARTY-NOTICES.txt" />
+
+  </files>
+</package>
diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec
index 273d8ff..f9be1e2 100644
--- a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec
+++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <package>
   <metadata minClientVersion="2.7">
-    <id>DotNetAnalyzers.DocumentationAnalyzers</id>
+    <id>$id$</id>
     <version>0.0.0</version>
-    <title>DotNetAnalyzers.DocumentationAnalyzers</title>
+    <title>$id$</title>
     <authors>Sam Harwell et. al.</authors>
     <owners>Sam Harwell</owners>
-    <licenseUrl>https://raw.githubusercontent.com/DotNetAnalyzers/DocumentationAnalyzers/$version$/LICENSE</licenseUrl>
+    <licenseUrl>https://raw.githubusercontent.com/DotNetAnalyzers/DocumentationAnalyzers/$GitCommitIdShort$/LICENSE</licenseUrl>
     <projectUrl>https://github.com/DotNetAnalyzers/DocumentationAnalyzers</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>An implementation of .NET documentation rules using Roslyn analyzers and code fixes</description>
@@ -17,6 +17,10 @@
   </metadata>
   <files>
 
+    <!-- Additional Files -->
+    <file src="..\..\LICENSE" />
+    <file src="..\..\THIRD-PARTY-NOTICES.txt" />
+
     <!-- Binaries and symbols -->
     <file src="bin\$Configuration$\netstandard1.1\DocumentationAnalyzers.dll" target="analyzers\dotnet\cs" />
     <file src="bin\$Configuration$\netstandard1.1\**\DocumentationAnalyzers.resources.dll" target="analyzers\dotnet\cs" />
diff --git a/DocumentationAnalyzers/DocumentationAnalyzers/DocumentationAnalyzers.csproj b/DocumentationAnalyzers/DocumentationAnalyzers/DocumentationAnalyzers.csproj
index 24f01fc..88187be 100644
--- a/DocumentationAnalyzers/DocumentationAnalyzers/DocumentationAnalyzers.csproj
+++ b/DocumentationAnalyzers/DocumentationAnalyzers/DocumentationAnalyzers.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.1;net452</TargetFrameworks>
-    <PackageId>DocumentationAnalyzers.NewIdRequiredDueToNuGetBug</PackageId>
   </PropertyGroup>
 
   <Choose>
diff --git a/build/build.ps1 b/build/build.ps1
index 8e19767..12fb4fe 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -16,8 +16,6 @@ if (!(Test-Path $SolutionPath)) {
 	exit 1
 }
 
-. .\version.ps1
-
 If ($Debug) {
 	$BuildConfig = 'Debug'
 } Else {
@@ -108,10 +106,3 @@ if (-not $SkipKeyCheck) {
 		}
 	}
 }
-
-if (-not (Test-Path 'nuget')) {
-	mkdir "nuget"
-}
-
-Copy-Item "..\DocumentationAnalyzers\DocumentationAnalyzers.CodeFixes\bin\$BuildConfig\DocumentationAnalyzers.$Version.nupkg" 'nuget'
-Copy-Item "..\DocumentationAnalyzers\DocumentationAnalyzers.CodeFixes\bin\$BuildConfig\DocumentationAnalyzers.$Version.symbols.nupkg" 'nuget'
diff --git a/build/push.ps1 b/build/push.ps1
deleted file mode 100644
index 1f842b9..0000000
--- a/build/push.ps1
+++ /dev/null
@@ -1,8 +0,0 @@
-. .\version.ps1
-
-If ($Version.EndsWith('-dev')) {
-	$host.ui.WriteErrorLine("Cannot push development version '$Version' to NuGet.")
-	Exit 1
-}
-
-..\.nuget\NuGet.exe 'push' ".\nuget\DocumentationAnalyzers.$Version.nupkg" -Source 'https://www.nuget.org/api/v2/package'
diff --git a/build/version.ps1 b/build/version.ps1
deleted file mode 100644
index 18ab0f9..0000000
--- a/build/version.ps1
+++ /dev/null
@@ -1 +0,0 @@
-$Version = "1.0.0-dev"