diff --git a/SPECS/openssh/openssh.spec b/SPECS/openssh/openssh.spec
index d0edcab2d7..fa2290b743 100644
--- a/SPECS/openssh/openssh.spec
+++ b/SPECS/openssh/openssh.spec
@@ -48,7 +48,6 @@ BuildOption(conf):  --without-zlib-version-check
 BuildOption(conf):  --without-ipaddr-display
 BuildOption(conf):  --with-pie=no
 BuildOption(conf):  --without-hardening
-BuildOption(conf):  --with-systemd
 BuildOption(conf):  --with-pam
 %if %{with selinux}
 BuildOption(conf):  --with-selinux
@@ -60,17 +59,20 @@ BuildOption(conf):  --with-kerberos5${krb5_prefix:+=${krb5_prefix}}
 %else
 BuildOption(conf):  --without-kerberos5
 %endif
+%if %{with fido2}
+BuildOption(conf):  --with-security-key-builtin
+%else
+BuildOption(conf):  --without-security-key-builtin
+%endif
 BuildOption(conf):  --with-libedit
 
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  pkgconfig(zlib)
-BuildRequires:  pkgconfig(audit)
 BuildRequires:  util-linux
 BuildRequires:  groff
 BuildRequires:  pkgconfig(pam)
 BuildRequires:  pkgconfig(openssl)
-BuildRequires:  pkgconfig(systemd)
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  make
 #BuildRequires:  pkgconfig(p11-kit-1)
@@ -78,12 +80,13 @@ BuildRequires:  make
 BuildRequires:  pkgconfig(libfido2)
 %endif
 BuildRequires:  pkgconfig(libxcrypt)
-%if %{with kerberos}
+%if %{with kerberos5}
 BuildRequires:  pkgconfig(krb5)
 %endif
 BuildRequires:  pkgconfig(libedit)
 BuildRequires:  pkgconfig(ncurses)
 %if %{with selinux}
+BuildRequires:  pkgconfig(audit)
 BuildRequires:  pkgconfig(libselinux)
 %endif
 %if %{with xorg}
@@ -96,7 +99,6 @@ Recommends:     p11-kit
 Requires:       openssl
 %if %{with selinux}
 Requires:       libselinux
-Requires:       pkgconfig(audit)
 %endif
 
 %description
@@ -313,4 +315,4 @@ popd
 %attr(0644,root,root) %{_sysusersdir}/openssh-server.conf
 
 %changelog
-%{?autochangelog}
+%autochangelog