diff --git a/openssh.changes b/openssh.changes
index 4854a4a..43b39f7 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Apr  2 11:23:05 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
+
+- Use %config(noreplace) for sshd_config . In any case, it's
+  recommended to drop a file in sshd_config.d instead of editing
+  sshd_config (bsc#1221063)
+- Use %{_libexecdir} when removing ssh-keycat instead of the
+  hardcoded path so it works in TW and SLE.
+
 -------------------------------------------------------------------
 Mon Mar  4 09:57:06 UTC 2024 - Pedro Monreal <pmonreal@suse.com>
 
diff --git a/openssh.spec b/openssh.spec
index dfa473d..d55b096 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -400,7 +400,7 @@ install -D -m 0755 %{SOURCE9} %{buildroot}%{_sbindir}/sshd-gen-keys-start
 mkdir -p %{buildroot}%{_sysusersdir}
 install -m 644 %{SOURCE14} %{buildroot}%{_sysusersdir}/sshd.conf
 
-rm %{buildroot}/usr/libexec/ssh/ssh-keycat
+rm %{buildroot}%{_libexecdir}/ssh/ssh-keycat
 #rm -r %{buildroot}/usr/lib/debug/.build-id
 
 # the hmac hashes - taken from openssl
@@ -500,10 +500,10 @@ test -f /etc/ssh/ssh_config.rpmsave && mv -v /etc/ssh/ssh_config.rpmsave /etc/ss
 %if %{defined _distconfdir}
 %attr(0755,root,root) %dir %{_distconfdir}/ssh
 %attr(0755,root,root) %dir %{_distconfdir}/ssh/sshd_config.d
-%attr(0640,root,root) %{_distconfdir}/ssh/sshd_config
+%attr(0640,root,root) %config(noreplace) %{_distconfdir}/ssh/sshd_config
 %attr(0644,root,root) %{_pam_vendordir}/sshd
 %else
-%attr(0640,root,root) %{_sysconfdir}/ssh/sshd_config
+%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/sshd
 %endif
 %if %{defined _distconfdir}