diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index 9aa36d3..5569236 100644
--- a/SPECS/dotnet.spec
+++ b/SPECS/dotnet.spec
@@ -28,13 +28,13 @@
 
 %global simple_name dotnet
 
-%global host_version 2.1.11
-%global runtime_version 2.1.11
-%global sdk_version 2.1.507
+%global host_version 2.1.8
+%global runtime_version 2.1.8
+%global sdk_version 2.1.504
 
 Name:           dotnet
 Version:        %{sdk_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        .NET Core CLI tools and runtime
 License:        MIT and ASL 2.0 and BSD
 URL:            https://github.com/dotnet/
@@ -50,8 +50,18 @@ Source0:        dotnet-v%{runtime_version}.tar.gz
 Source1:        check-debug-symbols.py
 Source2:        dotnet.sh
 
+# This is https://github.com/dotnet/corefx/pull/34443
+Patch1:         0001-NetFX-compatibility-fixes-for-X500DistinguishedName.patch
+Patch2:         0002-Drop-pal_asn1_print-in-favor-of-the-managed-code.patch
+Patch3:         0003-Add-hybrid-support-for-OpenSSL-1.0-and-1.1.patch
+Patch4:         0004-Use-HMAC_CTX_free-instead-of-free-on-a-HMAC_CTX-3422.patch
+Patch5:         0005-Prefer-OpenSSL-1.0.x-for-portable-builds.patch
+Patch6:         0006-Check-for-the-specific-in-use-version-of-OpenSSL-whe.patch
+Patch7:         0007-Relax-the-OpenSSL-error-checking-code.patch
+
 Patch10:        corefx-optflags-support.patch
 Patch11:        corefx-32956-alpn.patch
+Patch12:        corefx-rhel-runtime-ids.patch
 
 Patch100:       coreclr-build-python3.patch
 Patch101:       coreclr-cmake-python3.patch
@@ -65,7 +75,7 @@ Patch400:       cli-telemetry-optout.patch
 
 ExclusiveArch:  x86_64
 
-BuildRequires:  llvm-toolset-6.0-clang
+BuildRequires:  llvm-toolset
 BuildRequires:  cmake
 # Bootstrap SDK needs OpenSSL 1.0 to run, but we can build and then
 # run with either OpenSSL 1.0 or 1.1
@@ -81,8 +91,8 @@ BuildRequires:  libicu-devel
 %if ! %{use_bundled_libunwind}
 BuildRequires:  libunwind-devel
 %endif
-BuildRequires:  llvm-toolset-6.0-lldb-devel
-BuildRequires:  llvm-toolset-6.0-llvm
+BuildRequires:  lldb-devel
+BuildRequires:  llvm
 BuildRequires:  lttng-ust-devel
 BuildRequires:  make
 BuildRequires:  openssl-devel
@@ -194,13 +204,27 @@ cross platform applications that work on Linux, Mac and Windows.
 It particularly focuses on creating console applications, web
 applications and micro-services.
 
-
 %prep
 %setup -q -n %{simple_name}-v%{runtime_version}
 
+# Disable warnings
+sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj
+
+# Fix bad hardcoded path in build
+sed -i 's|/usr/share/dotnet|%{_libdir}/%{simple_name}|' src/core-setup/src/corehost/common/pal.unix.cpp
+
 pushd src/corefx
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 popd
 
 pushd src/coreclr
@@ -219,24 +243,13 @@ pushd src/cli
 %patch400 -p1
 popd
 
-# Fix bad hardcoded path in build
-sed -i 's|/usr/share/dotnet|%{_libdir}/%{simple_name}|' src/core-setup/src/corehost/common/pal.unix.cpp
-
-# Disable warnings
-sed -i 's|skiptests|skiptests ignorewarnings|' 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
 %endif
 
-cat source-build-info.txt
-
-find -iname 'nuget.config' -exec echo {} \; -exec cat {} \; -exec echo \;
-
 
 %build
-scl enable llvm-toolset-6.0 - <<EOF
 set -xe
 
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
@@ -257,8 +270,6 @@ VERBOSE=1 ./build.sh \
   /p:MinimalConsoleLogOutput=false \
   /p:ContinueOnPrebuiltBaselineError=true
 
-EOF
-
 
 %install
 install -d -m 0755 %{buildroot}%{_libdir}/%{simple_name}/
@@ -334,18 +345,6 @@ echo "Testing build results for debug symbols..."
 %{_libdir}/%{simple_name}/sdk/%{sdk_version}
 
 %changelog
-* Tue May 21 2019 Omair Majid <omajid@redhat.com> - 2.1.507-2
-- Link against strerror_r correctly
-- Resolves: RHBZ#1712471
-
-* Mon May 13 2019 Omair Majid <omajid@redhat.com> - 2.1.507-1
-- Update to .NET Core Runtime 2.1.11 and SDK 2.1.507
-- Resolves: RHBZ#1710068
-
-* Thu May 02 2019 Omair Majid <omajid@redhat.com> - 2.1.506-1
-- Update to .NET Core Runtime 2.1.10 and SDK 2.1.506
-- Resolves: RHBZ#1696836
-
 * Fri Feb 22 2019 Omair Majid <omajid@redhat.com> - 2.1.504-1
 - Update to .NET Core Runtime 2.1.8 and SDK 2.1.504
 - Sync with Fedora copr spec file