diff --git a/MetaPackages.sln b/MetaPackages.sln
index b7897ad663..0402c256f9 100644
--- a/MetaPackages.sln
+++ b/MetaPackages.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26510.0
+VisualStudioVersion = 15.0.26727.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}"
 EndProject
@@ -43,6 +43,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrimDeps", "tools\TrimDeps\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjectionApp", "test\TestSites\DependencyInjectionApp\DependencyInjectionApp.csproj", "{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SiteExtension", "src\Microsoft.AspNetCore.SiteExtension\Microsoft.AspNetCore.SiteExtension.csproj", "{A27ACBA8-25A6-4527-95D4-5B8D0537AF52}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -89,6 +91,10 @@ Global
 		{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A27ACBA8-25A6-4527-95D4-5B8D0537AF52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A27ACBA8-25A6-4527-95D4-5B8D0537AF52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A27ACBA8-25A6-4527-95D4-5B8D0537AF52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A27ACBA8-25A6-4527-95D4-5B8D0537AF52}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -106,5 +112,9 @@ Global
 		{79CF58CE-B020-45D8-BDB5-2D8036BEAD14} = {EC22261D-0DE1-47DE-8F7C-072675D6F5B4}
 		{67E4C92F-6D12-4C52-BB79-B8D11BFC6B82} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}
 		{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3} = {EC22261D-0DE1-47DE-8F7C-072675D6F5B4}
+		{A27ACBA8-25A6-4527-95D4-5B8D0537AF52} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {500600F2-E434-4372-B04D-39CAAADFF973}
 	EndGlobalSection
 EndGlobal
diff --git a/build/SiteExtension.targets b/build/SiteExtension.targets
new file mode 100644
index 0000000000..ce4eb73822
--- /dev/null
+++ b/build/SiteExtension.targets
@@ -0,0 +1,27 @@
+<Project>
+
+  <Target Name="BuildSiteExtension">
+
+    <GetDotNetHost>
+      <Output TaskParameter="DotNetDirectory" PropertyName="DotnetHomeDirectory" />
+    </GetDotNetHost>
+
+    <PropertyGroup>
+      <FallbackArchive>$(COHERENCE_SIGNED_DROP_LOCATION)\fallbackArchives\nuGetPackagesArchive-$(TimestampVersion).zip</FallbackArchive>
+      <RuntimeStore>$(COHERENCE_SIGNED_DROP_LOCATION)\Signed\PackageCache\aspnetcore-store-$(TimestampVersion)-win7-x86.zip</RuntimeStore>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <FallbackArchiveDestination>$(TempDir)FallbackArchive</FallbackArchiveDestination>
+      <RuntimeStoreDestination>$(TempDir)RuntimeStore</RuntimeStoreDestination>
+    </PropertyGroup>
+
+    <UnzipArchive File="$(FallbackArchive)" Destination="$(FallbackArchiveDestination)" Overwrite="true" />
+    <UnzipArchive File="$(RuntimeStore)" Destination="$(RuntimeStoreDestination)" Overwrite="true" />
+
+    <MSBuild Projects="$(RepositoryRoot)src\Microsoft.AspNetCore.SiteExtension\Microsoft.AspNetCore.SiteExtension.csproj"
+      Targets="Pack"
+      Properties="DotnetHomeDirectory=$(DotnetHomeDirectory);FallbackArchiveDestination=$(FallbackArchiveDestination);RuntimeStoreDestination=$(RuntimeStoreDestination)" />
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/build/repo.targets b/build/repo.targets
index 51ed667d7c..aa664ebd15 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -70,6 +70,8 @@
     <DockerRootDirectory>/opt/code/</DockerRootDirectory>
   </PropertyGroup>
 
+  <Import Project="SiteExtension.targets" />
+
   <Target Name="UpdateNuGetConfig">
     <UpdatePackageSource
       NuGetConfigPath="$(RepositoryRoot)NuGet.config"
@@ -240,6 +242,7 @@
     <PropertyGroup>
       <FallbackStagingDir>$(FallbackArchiveDir)obj/$(OutputPackageName)</FallbackStagingDir>
       <FallbackOutputArchive>$(RepositoryRoot)artifacts\$(OutputPackageName).lzma</FallbackOutputArchive>
+      <FallbackOutputArchiveZip>$(RepositoryRoot)artifacts\$(OutputPackageName).zip</FallbackOutputArchiveZip>
       <FallbackRestoreConfigFile>$(FallbackArchiveDir)\obj\$(OutputPackageName).NuGet.config</FallbackRestoreConfigFile>
     </PropertyGroup>
 
@@ -257,7 +260,13 @@
     <MSBuild Projects="$(FallbackArchiveProj)" Targets="Restore" Properties="RestorePackagesPath=$(FallbackStagingDir);AspNetPackageVersion=$(AspNetPackageVersion);RestoreConfigFile=$(FallbackRestoreConfigFile)" />
 
     <!-- Create the archive -->
-    <Message Text="Producing LZMA Archive, this may take a while..." Importance="high" />
+    <Message Text="Producing LZMA and ZIP Archives, this may take a while..." Importance="high" />
+
+    <ItemGroup>
+      <FallbackOutputFiles Include="$(FallbackStagingDir)\**\*.*" />
+    </ItemGroup>
+
+    <ZipArchive File="$(FallbackOutputArchiveZip)" SourceFiles="@(FallbackOutputFiles)" WorkingDirectory="$(FallbackStagingDir)" Overwrite="true"/>
     <Exec Command="$(ArchiverPath) -a $(FallbackOutputArchive) $(FallbackStagingDir)" />
   </Target>
 
@@ -285,7 +294,15 @@
     <PropertyGroup>
         <PublishDir Condition="'$(PublishShare)' != ''">$(PublishShare)\fallbackArchives</PublishDir>
     </PropertyGroup>
-    <Copy SourceFiles="$(RepositoryRoot)artifacts\$(TimestampOutputPackageName).lzma;$(RepositoryRoot)artifacts\$(NoTimestampOutputPackageName).lzma" DestinationFolder="$(PublishDir)" Condition="'$(PublishDir)' != ''" />
+
+    <Copy
+        SourceFiles="
+          $(RepositoryRoot)artifacts\$(TimestampOutputPackageName).lzma;
+          $(RepositoryRoot)artifacts\$(NoTimestampOutputPackageName).lzma;
+          $(RepositoryRoot)artifacts\$(TimestampOutputPackageName).zip;
+          $(RepositoryRoot)artifacts\$(NoTimestampOutputPackageName).zip"
+        DestinationFolder="$(PublishDir)"
+        Condition="'$(PublishDir)' != ''" />
   </Target>
 
   <Target Name="AddManifestsToNupkg">
diff --git a/src/Microsoft.AspNetCore.SiteExtension/Microsoft.AspNetCore.SiteExtension.csproj b/src/Microsoft.AspNetCore.SiteExtension/Microsoft.AspNetCore.SiteExtension.csproj
new file mode 100644
index 0000000000..e8e11b68d6
--- /dev/null
+++ b/src/Microsoft.AspNetCore.SiteExtension/Microsoft.AspNetCore.SiteExtension.csproj
@@ -0,0 +1,53 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\build\common.props" />
+
+  <PropertyGroup>
+    <title>ASP.NET Core Extensions</title>
+    <Description>This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging.</Description>
+    <TargetFramework>net461</TargetFramework>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <PackageTags>aspnet;logging;aspnetcore;AzureSiteExtension</PackageTags>
+    <PackageType>AzureSiteExtension</PackageType>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IncludeSymbols>false</IncludeSymbols>
+    <ContentTargetFolders>content</ContentTargetFolders>
+    <!-- These need to be set manually because this is not marked as a shipping (to nuget.org) package. https://github.com/aspnet/AzureIntegration/issues/38 -->
+    <PackageLicenseUrl>https://github.com/aspnet/AzureIntegration/blob/rel/2.0.0-preview1/LICENSE.txt</PackageLicenseUrl>
+    <PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
+    <PackageProjectUrl>https://www.asp.net/</PackageProjectUrl>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="applicationHost.xdt" />
+    <!-- <Content Include="bin\$(Configuration)\$(TargetFramework)\Microsoft.Web.Xdt.Extensions.dll" PackagePath="content" /> -->
+  </ItemGroup>
+
+ <Target Name="PackTaskDependencies" BeforeTargets="GenerateNuspec">
+
+    <Message Text="Collecting package files from $(DotnetHomeDirectory), $(FallbackArchiveDestination), $(RuntimeStoreDestination)" Importance="high" />
+
+    <ItemGroup>
+      <_PackageFiles Include="$(DotnetHomeDirectory)\**\*.*" Exclude="$(DotnetHomeDirectory)\sdk\NuGetFallbackFolder\**\*.*;$(DotnetHomeDirectory)\store\**\*.*;$(DotnetHomeDirectory)\additionalDeps\**\*.*" Condition="$(DotnetHomeDirectory) != ''">
+        <PackagePath>tools\</PackagePath>
+        <Visible>false</Visible>
+        <BuildAction>Content</BuildAction>
+      </_PackageFiles>
+
+      <_PackageFiles Include="$(FallbackArchiveDestination)\**\*.*" Condition="$(FallbackArchiveDestination) != ''">
+        <PackagePath>tools\sdk\NuGetFallbackFolder\</PackagePath>
+        <Visible>false</Visible>
+        <BuildAction>Content</BuildAction>
+      </_PackageFiles>
+
+      <_PackageFiles Include="$(RuntimeStoreDestination)\**\*.*" Condition="$(RuntimeStoreDestination) != ''">
+        <PackagePath>tools\</PackagePath>
+        <Visible>false</Visible>
+        <BuildAction>Content</BuildAction>
+      </_PackageFiles>
+    </ItemGroup>
+
+  </Target>
+
+</Project>
+
diff --git a/src/Microsoft.AspNetCore.SiteExtension/applicationHost.xdt b/src/Microsoft.AspNetCore.SiteExtension/applicationHost.xdt
new file mode 100644
index 0000000000..3cb633cdf6
--- /dev/null
+++ b/src/Microsoft.AspNetCore.SiteExtension/applicationHost.xdt
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+
+  <xdt:Import path="%XDT_EXTENSIONPATH%\Microsoft.Web.Xdt.Extensions.dll"
+              namespace="Microsoft.Web.Xdt.Extensions" />
+
+    <system.webServer xdt:Transform="InsertIfMissing">
+      <runtime xdt:Transform="InsertIfMissing" >
+        <environmentVariables xdt:Transform="InsertIfMissing">
+          <add name="PATH" value="%XDT_EXTENSIONPATH%\tools" xdt:Locator="Match(name)" xdt:Transform="InsertOrAppendAttribute(Attribute='value')" />
+          <add name="DOTNET_ADDITIONAL_DEPS" value="%XDT_EXTENSIONPATH%\tools\Microsoft.AspNetCore.AzureAppServices.HostingStartup\" xdt:Locator="Match(name)" xdt:Transform="InsertOrAppendAttribute(Attribute='value')" />
+        </environmentVariables>
+      </runtime>
+    </system.webServer>
+</configuration>
\ No newline at end of file