diff --git a/.dotnet.metadata b/.dotnet.metadata
index a8f139c..133d204 100644
--- a/.dotnet.metadata
+++ b/.dotnet.metadata
@@ -1 +1 @@
-30e071d32023a8021d76ec832a6f94e2404c8170 SOURCES/dotnet-v2.1.511-SDK.tar.gz
+88a5b4436d7f848b33121f8aad2d37dc9ba93a1f SOURCES/dotnet-v2.1.513-SDK.tar.gz
diff --git a/.gitignore b/.gitignore
index daa1e39..f90b675 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v2.1.511-SDK.tar.gz
+SOURCES/dotnet-v2.1.513-SDK.tar.gz
diff --git a/SOURCES/coreclr-mscorlib.patch b/SOURCES/coreclr-mscorlib.patch
deleted file mode 100644
index ca59e77..0000000
--- a/SOURCES/coreclr-mscorlib.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5164e76ce01fc36833a7f5e6fb7b1ec2f55c2262 Mon Sep 17 00:00:00 2001
-From: Omair Majid <omajid@redhat.com>
-Date: Wed, 1 Aug 2018 12:02:53 -0400
-Subject: [PATCH] Use the identified python when building
- System.Private.CoreLib (#19043)
-
-build.sh and build.cmd contain logic to identify a working version of
-python to use. System.Private.CoreLib ignores that and directly invokes
-'python', which may not work, or even execute a different program.
----
- build.sh                                                 | 2 ++
- src/System.Private.CoreLib/System.Private.CoreLib.csproj | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/build.sh b/build.sh
-index 091d6227caf..4002f2744c2 100755
---- a/build.sh
-+++ b/build.sh
-@@ -22,6 +22,8 @@ then
-    exit 1
- fi
- 
-+export PYTHON
-+
- usage()
- {
-     echo "Usage: $0 [BuildArch] [BuildType] [-verbose] [-coverage] [-cross] [-clangx.y] [-ninja] [-configureonly] [-skipconfigure] [-skipnative] [-skipmscorlib] [-skiptests] [-stripsymbols] [-ignorewarnings] [-cmakeargs] [-bindir]"
-diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj
-index 9a2fc681703..0a02d3cffdf 100644
---- a/src/mscorlib/System.Private.CoreLib.csproj
-+++ b/src/mscorlib/System.Private.CoreLib.csproj
-@@ -543,7 +543,7 @@
-     <PropertyGroup>
-       <CMakeDefinitionSaveFile>$(IntermediateOutputPath)..\cmake.definitions</CMakeDefinitionSaveFile>
-     </PropertyGroup>
--    <Exec Command="python $(MSBuildThisFileDirectory)..\scripts\check-definitions.py &quot;$(CMakeDefinitionSaveFile)&quot; &quot;$(DefineConstants)&quot; &quot;$(IgnoreDefineConstants)&quot; " />
-+    <Exec Command="&quot;$(PYTHON)&quot; $(MSBuildThisFileDirectory)..\scripts\check-definitions.py &quot;$(CMakeDefinitionSaveFile)&quot; &quot;$(DefineConstants)&quot; &quot;$(IgnoreDefineConstants)&quot; " />
-   </Target>
-   <PropertyGroup Condition="'$(BuildOS)' == 'Windows_NT'">
-     <EnableDotnetAnalyzers Condition="'$(EnableDotnetAnalyzers)'==''">true</EnableDotnetAnalyzers>
diff --git a/SOURCES/corefx-optflags-support.patch b/SOURCES/corefx-optflags-support.patch
index a445618..8ab8409 100644
--- a/SOURCES/corefx-optflags-support.patch
+++ b/SOURCES/corefx-optflags-support.patch
@@ -1,15 +1,3 @@
-diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt
-index 7d804a1e54..717c2718d7 100644
---- a/src/Native/Unix/CMakeLists.txt
-+++ b/src/Native/Unix/CMakeLists.txt
-@@ -25,7 +25,6 @@ add_compile_options(-fPIC)
- add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common)
- add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common)
- add_compile_options(-g)
--add_compile_options(-Werror)
- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
-     add_compile_options(-Wno-unreachable-code)
- endif ()
 diff --git a/src/Native/Unix/configure.cmake b/src/Native/Unix/configure.cmake
 index f4a30ad6cb..f2db68402a 100644
 --- a/src/Native/Unix/configure.cmake
diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index a1a9171..df946af 100644
--- a/SPECS/dotnet.spec
+++ b/SPECS/dotnet.spec
@@ -28,9 +28,9 @@
 
 %global simple_name dotnet
 
-%global host_version 2.1.15
-%global runtime_version 2.1.15
-%global sdk_version 2.1.511
+%global host_version 2.1.17
+%global runtime_version 2.1.17
+%global sdk_version 2.1.513
 
 Name:           dotnet
 Version:        %{sdk_version}
@@ -51,8 +51,7 @@ Patch11:        corefx-32956-alpn.patch
 
 Patch100:       coreclr-build-python3.patch
 Patch101:       coreclr-cmake-python3.patch
-Patch102:       coreclr-mscorlib.patch
-Patch103:       coreclr-pie.patch
+Patch102:       coreclr-pie.patch
 
 Patch300:       core-setup-4510-commit-id.patch
 Patch301:       core-setup-pie.patch
@@ -203,7 +202,6 @@ pushd src/coreclr
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
-%patch103 -p1
 popd
 
 pushd src/core-setup
@@ -221,6 +219,10 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/%{simple_name}|' src/core-setup/src/coreh
 # Disable warnings
 sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj
 
+# If CLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE is missing, add it back
+grep CLR_CMAKE_USE_SYSTEM_LIBUNWIND repos/coreclr.proj || \
+    sed -i 's|\$(BuildArguments) </BuildArguments>|$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE</BuildArguments>|' repos/coreclr.proj
+
 %if %{use_bundled_libunwind}
 # Use bundled libunwind
 sed -i 's|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=FALSE|' repos/coreclr.proj
@@ -314,6 +316,14 @@ rm %{buildroot}%{_libdir}/%{simple_name}/dotnet
 %{_libdir}/%{simple_name}/sdk/%{sdk_version}
 
 %changelog
+* Tue Mar 24 2020 Omair Majid <omajid@redhat.com> - 2.1.513-1
+- Update to .NET Core Runtime 2.1.17 and SDK 2.1.513
+- Resolves: RHBZ#1816197
+
+* Sat Mar 07 2020 Omair Majid <omajid@redhat.com> - 2.1.512-1
+- Update to .NET Core Runtime 2.1.16 and SDK 2.1.512
+- Resolves: RHBZ#1806955
+
 * Wed Jan 08 2020 Omair Majid <omajid@redhat.com> - 2.1.511-1
 - Update to .NET Core Runtime 2.1.15 and SDK 2.1.511
 - Resolves: RHBZ#1788169