diff --git a/patches/runtime/0014-Attempt-workaround-for-https-github.com-dotnet-runti.patch b/patches/runtime/0014-Attempt-workaround-for-https-github.com-dotnet-runti.patch
deleted file mode 100644
index 65370e4f94..0000000000
--- a/patches/runtime/0014-Attempt-workaround-for-https-github.com-dotnet-runti.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 691601f7f2ab0274ddddbf8ff47800455c0098a4 Mon Sep 17 00:00:00 2001
-From: Chris Rummel <crummel@microsoft.com>
-Date: Wed, 2 Sep 2020 20:33:24 -0500
-Subject: [PATCH] Attempt workaround for
- https://github.com/dotnet/runtime/issues/41768
-
----
- src/libraries/Native/build-native.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libraries/Native/build-native.sh b/src/libraries/Native/build-native.sh
-index fb8b183403e..6024c8b30c7 100755
---- a/src/libraries/Native/build-native.sh
-+++ b/src/libraries/Native/build-native.sh
-@@ -66,7 +66,7 @@ elif [[ "$__TargetOS" == Android && -z "$ROOTFS_DIR" ]]; then
-     # nothing to do here
-     true
- else
--    __CMakeArgs="-DFEATURE_DISTRO_AGNOSTIC_SSL=$__PortableBuild $__CMakeArgs"
-+    __CMakeArgs="-DFEATURE_DISTRO_AGNOSTIC_SSL=true $__CMakeArgs"
-     __CMakeArgs="-DCMAKE_STATIC_LIB_LINK=$__StaticLibLink $__CMakeArgs"
- 
-     if [[ "$__BuildArch" != x86 && "$__BuildArch" != x64 ]]; then
--- 
-2.18.0
-
diff --git a/patches/runtime/0014-Fix-singlefilehost-build-in-non-portable-mode-42415.patch b/patches/runtime/0014-Fix-singlefilehost-build-in-non-portable-mode-42415.patch
new file mode 100644
index 0000000000..fb875aa462
--- /dev/null
+++ b/patches/runtime/0014-Fix-singlefilehost-build-in-non-portable-mode-42415.patch
@@ -0,0 +1,60 @@
+From eac34237f8ee3e85a42af772fa37671c1dbfee73 Mon Sep 17 00:00:00 2001
+From: Omair Majid <omajid@redhat.com>
+Date: Wed, 23 Sep 2020 10:48:12 -0400
+Subject: [PATCH] Fix singlefilehost build in non-portable mode (#42415)
+
+The singilefilehost needs to follow the libraries build in terms of how
+it links to OpenSSL: if it's a non-portable build, the singlefilehost
+needs to link to OpenSSL via linker arguments.
+
+The installer also needs to have FEATURE_DISTRO_AGNOSTIC_SSL defined
+just like it is defined for the libraries build.
+
+Fixes: #41768
+---
+ src/installer/corehost/build.sh                      |  1 +
+ .../corehost/cli/apphost/static/CMakeLists.txt       | 12 ++++++++++++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/src/installer/corehost/build.sh b/src/installer/corehost/build.sh
+index c0bbce8e591..bd789c6f34f 100755
+--- a/src/installer/corehost/build.sh
++++ b/src/installer/corehost/build.sh
+@@ -92,6 +92,7 @@ export __BinDir __IntermediatesDir __CoreClrArtifacts __NativeLibsArtifacts
+ __CMakeArgs="-DCLI_CMAKE_HOST_VER=\"$__host_ver\" -DCLI_CMAKE_COMMON_HOST_VER=\"$__apphost_ver\" -DCLI_CMAKE_HOST_FXR_VER=\"$__fxr_ver\" $__CMakeArgs"
+ __CMakeArgs="-DCLI_CMAKE_HOST_POLICY_VER=\"$__policy_ver\" -DCLI_CMAKE_PKG_RID=\"$__DistroRid\" -DCLI_CMAKE_COMMIT_HASH=\"$__commit_hash\" $__CMakeArgs"
+ __CMakeArgs="-DCORECLR_ARTIFACTS=\"$__CoreClrArtifacts\" -DNATIVE_LIBS_ARTIFACTS=\"$__NativeLibsArtifacts\" $__CMakeArgs"
++__CMakeArgs="-DFEATURE_DISTRO_AGNOSTIC_SSL=$__PortableBuild $__CMakeArgs"
+ 
+ if [[ "$__PortableBuild" == 1 ]]; then
+     __CMakeArgs="-DCLI_CMAKE_PORTABLE_BUILD=1 $__CMakeArgs"
+diff --git a/src/installer/corehost/cli/apphost/static/CMakeLists.txt b/src/installer/corehost/cli/apphost/static/CMakeLists.txt
+index 85ea6ffe642..87db505c521 100644
+--- a/src/installer/corehost/cli/apphost/static/CMakeLists.txt
++++ b/src/installer/corehost/cli/apphost/static/CMakeLists.txt
+@@ -191,6 +191,11 @@ else()
+     #     )
+     endif ()
+ 
++    # Additional requirements for System.Security.Cryptography.Native.OpenSsl
++    if(NOT FEATURE_DISTRO_AGNOSTIC_SSL)
++        find_package(OpenSSL)
++    endif()
++
+     if(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_NETBSD OR CLR_CMAKE_TARGET_SUNOS)
+         # These options are used to force every object to be included even if it's unused.
+         set(START_WHOLE_ARCHIVE -Wl,--whole-archive)
+@@ -212,3 +217,10 @@ target_link_libraries(singlefilehost
+     ${NATIVE_LIBS}
+     ${END_WHOLE_ARCHIVE}
+ )
++
++if(NOT FEATURE_DISTRO_AGNOSTIC_SSL)
++    target_link_libraries(singlefilehost
++        ${OPENSSL_CRYPTO_LIBRARY}
++        ${OPENSSL_SSL_LIBRARY}
++    )
++endif()
+-- 
+2.26.2
+