diff --git a/files/Correct-DotNetBitsVersions.props.patch b/files/Correct-DotNetBitsVersions.props.patch
deleted file mode 100644
--- a/files/Correct-DotNetBitsVersions.props.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
-+++ b/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
-@@ -1,6 +1,6 @@
- <Project DefaultTargets="DeploySdksAndNuGets">
-     <Import Project="$(MSBuildThisFileDirectory)\..\common.props" />
--    <Import Project="$(MSBuildThisFileDirectory)\..\DotnetBitsVersions.props" />
-+    <Import Project="$(MSBuildThisFileDirectory)\..\DotNetBitsVersions.props" />
- 
-     <PropertyGroup>
-         <HostOSName Condition="'$(HostOSName)' == ''">osx</HostOSName>
---- a/mono/build/update_bundled_bits.proj
-+++ b/mono/build/update_bundled_bits.proj
-@@ -1,5 +1,5 @@
- <Project DefaultTargets="FetchAndUpdateSdksAndNuGets">
--    <Import Project="$(MSBuildThisFileDirectory)\DotnetBitsVersions.props" />
-+    <Import Project="$(MSBuildThisFileDirectory)\DotNetBitsVersions.props" />
- 
-     <Target Name="Build" DependsOnTargets="FetchAndUpdateSdksAndNuGets" />
- 
diff --git a/files/NuGet.config b/files/NuGet.config
new file mode 100644
--- /dev/null
+++ b/files/NuGet.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+    <add key="arcade" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="myget-legacy@Local" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy%40Local/nuget/v3/index.json" />
+    <add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="vside_vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
+    <add key="vside_vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
+  </packageSources>
+  <disabledPackageSources />
+</configuration>
diff --git a/files/Remove-Microsoft.DotNet.MSBuildSdkResolver.patch b/files/Remove-Microsoft.DotNet.MSBuildSdkResolver.patch
deleted file mode 100644
--- a/files/Remove-Microsoft.DotNet.MSBuildSdkResolver.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 58030d04e2bb8c14d36408f9695d4ec02ff91460 Mon Sep 17 00:00:00 2001
-From: Ankit Jain <ankit.jain@microsoft.com>
-Date: Wed, 21 Aug 2019 12:55:27 -0400
-Subject: [PATCH] [mono] Remove Microsoft.DotNet.MSBuildSdkResolver on linux
- for the
-
-.. bootstrap build. This is because it depends on a native lib,
-libhostfxr*, which is not present in the bootrap msbuild, which breaks
-the resolver and thus the build. Removing this should be fine, because
-msbuild then just falls back to the bundled SDKs.
----
- eng/cibuild_bootstrapped_msbuild.sh | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/eng/cibuild_bootstrapped_msbuild.sh b/eng/cibuild_bootstrapped_msbuild.sh
-index b6da0a9c32..bc4d58a92f 100755
---- a/eng/cibuild_bootstrapped_msbuild.sh
-+++ b/eng/cibuild_bootstrapped_msbuild.sh
-@@ -57,6 +57,11 @@ function DownloadMSBuildForMono {
-     # rename just to make it obvious when reading logs!
-     mv $artifacts_dir/msbuild $mono_msbuild_dir
-     chmod +x $artifacts_dir/mono-msbuild/MSBuild.dll
-+
-+    if [[ `uname -s` != 'Darwin' ]]; then
-+        # with no .so available, this ends up breaking the build
-+        rm -Rf $mono_msbuild_dir/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver
-+    fi
-     rm "$msbuild_zip"
-   fi
- }
- 
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,11 +1,13 @@
 name       : mono-msbuild
-version    : '16.5'
-release    : 5
+version    : '16.8'
+release    : 6
 source     :
-    - https://github.com/mono/linux-packaging-msbuild/archive/upstream/16.5+xamarinxplat.2020.01.10.05.36.tar.gz : 5062f73e0425dcd68c9d5cb088583d18d1ec8936edc41527731acd9a243d0c13
+    - https://github.com/mono/linux-packaging-msbuild/archive/upstream/16.8+xamarinxplat.2020.07.30.15.02.tar.gz : 418fd785988347d9e78f634fd62440b65be3115582f85b6f91d9d7893178b579
+    - https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.100/dotnet-sdk-3.1.100-linux-x64.tar.gz : 3687b2a150cd5fef6d60a4693b4166994f32499c507cd04f346b6dda38ecdc46
 license    : MIT
 component  : programming.tools
-summary    : the build platform for .NET and Visual Studio
+summary    :
+    - The build platform for .NET and Visual Studio
 description: |
     The Microsoft Build Engine is a platform for building applications. This engine, which is also known as MSBuild, provides an XML schema for a project file that controls how the build platform processes and builds software.
 networking : yes
@@ -14,14 +16,17 @@
     - mono-msbuild
 rundeps    :
     - mono
+environment: |
+    export LD_LIBRARY_PATH=$(dirname $workdir/.dotnet/host/fxr/*/libhostfxr.so):$LD_LIBRARY_PATH
 setup      : |
     cert-sync --user /etc/ssl/certs/ca-certificates.crt
-    %patch -p1 < $pkgfiles/Remove-Microsoft.DotNet.MSBuildSdkResolver.patch
-    %patch -p1 < $pkgfiles/Correct-DotNetBitsVersions.props.patch
+    mkdir .dotnet
+    tar xf $sources/dotnet-sdk* --strip-components=1 -C .dotnet
+    cp $pkgfiles/NuGet.config .
     mv LICENSE license
 build      : |
-    %make all-mono
+    ./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --binaryLog --skip_tests /p:DotNetBuildFromSource=true
 install    : |
-    ./install-mono-prefix.sh $installdir/usr
+    sed -i -e "s|4</WarningLevel>|3</WarningLevel>|" artifacts/bin/MSBuild.Bootstrap/Release-MONO/net472/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.CSharp.props
+    msbuild mono/build/install.proj /p:MonoInstallPrefix="$installdir/usr" /p:Configuration=Release-MONO /p:IgnoreDiffFailure=true
     sed -i -e "s|$installdir||g" $installdir/usr/bin/msbuild
-    rm -rf $installdir/usr/lib/mono/xbuild/15.0
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,18 +3,18 @@
         <Name>mono-msbuild</Name>
         <Packager>
             <Name>Martin Reboredo</Name>
-            <Email>gc1000ll@gmail.com</Email>
+            <Email>yakoyoku@gmail.com</Email>
         </Packager>
         <License>MIT</License>
         <PartOf>programming.tools</PartOf>
-        <Summary xml:lang="en">the build platform for .NET and Visual Studio</Summary>
+        <Summary xml:lang="en">The build platform for .NET and Visual Studio</Summary>
         <Description xml:lang="en">The Microsoft Build Engine is a platform for building applications. This engine, which is also known as MSBuild, provides an XML schema for a project file that controls how the build platform processes and builds software.
 </Description>
         <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
     </Source>
     <Package>
         <Name>mono-msbuild</Name>
-        <Summary xml:lang="en">the build platform for .NET and Visual Studio</Summary>
+        <Summary xml:lang="en">The build platform for .NET and Visual Studio</Summary>
         <Description xml:lang="en">The Microsoft Build Engine is a platform for building applications. This engine, which is also known as MSBuild, provides an XML schema for a project file that controls how the build platform processes and builds software.
 </Description>
         <PartOf>programming.tools</PartOf>
@@ -23,27 +23,25 @@
             <Path fileType="library">/usr/lib/mono/msbuild/15.0</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/MSBuild.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/MSBuild.dll.config</Path>
-            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/MSBuild.pdb</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/MSBuild.rsp</Path>
-            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.CommonTypes.xsd</Path>
-            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Core.xsd</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Bcl.AsyncInterfaces.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Framework.dll</Path>
-            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Framework.pdb</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Framework.xml</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.NuGetSdkResolver.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Tasks.Core.dll</Path>
-            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Tasks.Core.pdb</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Tasks.Core.dll.config</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Tasks.Core.xml</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Tasks.v12.0.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Tasks.v4.0.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Utilities.Core.dll</Path>
-            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Utilities.Core.pdb</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Utilities.Core.dll.config</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Utilities.Core.xml</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Utilities.v12.0.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.Utilities.v4.0.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.dll</Path>
-            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.pdb</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.dll.config</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.xml</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Build.xsd</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.CSharp.CrossTargeting.targets</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.CSharp.CurrentVersion.targets</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.CSharp.Mono.targets</Path>
@@ -55,6 +53,8 @@
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Common.targets</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Common.tasks</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Data.Entity.targets</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Managed.After.targets</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Managed.Before.targets</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.Managed.targets</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.NET.props</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Microsoft.NETCoreSdk.BundledVersions.props</Path>
@@ -87,6 +87,7 @@
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/NuGet.Protocol.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/NuGet.Resolver.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/NuGet.Versioning.dll</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/NuGet.props</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/NuGet.targets</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/SdkResolvers/Microsoft.Build.NuGetSdkResolver/Microsoft.Build.NuGetSdkResolver.xml</Path>
@@ -137,6 +138,7 @@
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Publish/tools/net46/Microsoft.Web.Delegation.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Publish/tools/net46/Microsoft.Web.Deployment.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Publish/tools/net46/Microsoft.Web.XmlTransform.dll</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Razor/Icon.png</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets</Path>
@@ -160,7 +162,6 @@
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Razor/extensions/mvc-3-0/Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Razor/lib/netstandard2.0/_._</Path>
-            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Razor/packageIcon.png</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Razor/tasks/net46/Microsoft.NET.Sdk.Razor.Tasks.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Razor/tasks/net46/System.Collections.Immutable.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk.Razor/tasks/net46/System.Reflection.Metadata.dll</Path>
@@ -255,7 +256,6 @@
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk/tools/net472/zh-Hans/Microsoft.NET.Build.Tasks.resources.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/Microsoft.NET.Sdk/tools/net472/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Build.Tasks.Pack.dll</Path>
-            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Build.Tasks.Pack.xml</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/NuGet.Build.Tasks.Pack.resources.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/NuGet.Build.Tasks.Pack.resources.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/NuGet.Build.Tasks.Pack.resources.dll</Path>
@@ -332,7 +332,11 @@
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/System.Reflection.Metadata.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/System.Resources.Extensions.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/System.Runtime.CompilerServices.Unsafe.dll</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/System.Text.Encodings.Web.dll</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/System.Text.Json.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/System.Threading.Tasks.Dataflow.dll</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/System.Threading.Tasks.Extensions.dll</Path>
+            <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/System.ValueTuple.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Workflow.VisualBasic.targets</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/Workflow.targets</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/cs/MSBuild.resources.dll</Path>
@@ -391,6 +395,7 @@
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/zh-Hant/Microsoft.Build.Tasks.Core.resources.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/zh-Hant/Microsoft.Build.Utilities.Core.resources.dll</Path>
             <Path fileType="library">/usr/lib/mono/msbuild/Current/bin/zh-Hant/Microsoft.Build.resources.dll</Path>
+            <Path fileType="library">/usr/lib/mono/xbuild/15.0</Path>
             <Path fileType="library">/usr/lib/mono/xbuild/Current/Microsoft.Common.props</Path>
             <Path fileType="library">/usr/lib/mono/xbuild/Current/Microsoft.Common.targets/ImportAfter/Microsoft.Common.Mono.After.targets</Path>
             <Path fileType="library">/usr/lib/mono/xbuild/Current/Microsoft.Common.targets/ImportAfter/Microsoft.NET.Build.Extensions.targets</Path>
@@ -542,12 +547,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="5">
-            <Date>2020-02-19</Date>
-            <Version>16.5</Version>
+        <Update release="6">
+            <Date>2021-02-24</Date>
+            <Version>16.8</Version>
             <Comment>Packaging update</Comment>
             <Name>Martin Reboredo</Name>
-            <Email>gc1000ll@gmail.com</Email>
+            <Email>yakoyoku@gmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file