diff --git a/openssh.spec b/openssh.spec
index 7a0ba8f..4353618 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -52,13 +52,14 @@
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %global openssh_ver 8.7p1
 %global openssh_rel 19
+%global hyperscale_rel 1
 %global pam_ssh_agent_ver 0.10.4
 %global pam_ssh_agent_rel 5
 
 Summary: An open source implementation of SSH protocol version 2
 Name: openssh
 Version: %{openssh_ver}
-Release: %{openssh_rel}%{?dist}
+Release: %{openssh_rel}.%{hyperscale_rel}%{?dist}
 URL: http://www.openssh.com/portable.html
 #URL1: https://github.com/jbeverly/pam_ssh_agent_auth/
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -322,7 +323,7 @@ Requires: openssh = %{version}-%{release}
 %package -n pam_ssh_agent_auth
 Summary: PAM module for authentication with ssh-agent
 Version: %{pam_ssh_agent_ver}
-Release: %{pam_ssh_agent_rel}.%{openssh_rel}%{?dist}
+Release: %{pam_ssh_agent_rel}.%{openssh_rel}.%{hyperscale_rel}%{?dist}
 License: BSD
 
 %description
@@ -435,11 +436,17 @@ popd
 %patch980 -p1 -b .sftpdirs
 %patch981 -p1 -b .scp-sftpdirs
 %patch982 -p1 -b .minrsabits
+%if 0%{?rhel} > 8
+# This patch results in build failures on el8
 %patch983 -p1 -b .evpgenrsa
+%endif
 
 %patch200 -p1 -b .audit
 %patch201 -p1 -b .audit-race
+%if 0%{?rhel} > 8
+# This patch is based onto evpgenrsa and doesn't apply cleanly without it
 %patch700 -p1 -b .fips
+%endif
 
 %patch1000 -p1 -b .minimize-sha1-use
 %patch1001 -p1 -b .scp-clears-file
@@ -728,6 +735,9 @@ test -f %{sysconfig_anaconda} && \
 %endif
 
 %changelog
+* Wed Jul 20 2022 Davide Cavalca <dcavalca@centosproject.org> - 8.7p1-19.1 + 0.10.4-5.1
+- Make it build on el8 as well for Hyperscale
+
 * Fri Jul 15 2022 Dmitry Belyavskiy <dbelyavs@redhat.com> - 8.7p1-19 + 0.10.4-5
 - FIX pam_ssh_agent_auth auth for RSA keys
   Related: rhbz#2070113