diff --git a/s390-tools.changes b/s390-tools.changes
index e679b77..9f44bf8 100644
--- a/s390-tools.changes
+++ b/s390-tools.changes
@@ -1,12 +1,14 @@
 -------------------------------------------------------------------
-Fri Apr 12 08:59:53 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+Fri Apr 12 15:28:09 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
 
 - Updated the .spec file to enable Secure Execution in the Cloud (bsc#1222675)
   * Creates a s390-tools-genprotimg-data-*.noarch.rpm package which includes
     s390x bootload binaries for x86_64: 
-    - stage3a.bin and 
-    - stage3b_reloc.bin 
-    - plus check_hostkeydoc script
+    - /lib/s390-tools/stage3.bin
+    - /usr/share/s390-tools/genprotimg/stage3a.bin
+    - /usr/share/s390-tools/genprotimg/stage3b_reloc.bin
+  * Excludes the above binaries from the (main) s390-tools-*.s390x.rpm
+  * Requires: s390-tools-genprotimg-data 
 
 -------------------------------------------------------------------
 Thu Apr  4 03:51:55 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
diff --git a/s390-tools.spec b/s390-tools.spec
index 86d628d..b50bd5b 100644
--- a/s390-tools.spec
+++ b/s390-tools.spec
@@ -196,6 +196,7 @@ BuildRequires:  openssl
 #!BuildIgnore:  gcc-PIE
 Requires:       coreutils
 Requires:       procps
+Requires:       s390-tools-genprotimg-data
 Requires:       util-linux
 %ifarch s390x
 Requires:       gawk
@@ -342,8 +343,6 @@ Summary:        Build of genprotimg for and on x86_64 machines
 License:        MIT
 Group:          System/Boot
 BuildArch:      noarch
-Conflicts:      s390-tools
-# ExpandFlags:    ignoreconflicts
 
 %description genprotimg-data
 These tools (genprotimg) would allow to prepare and analyze boot images
@@ -737,6 +736,10 @@ done
 %dir /etc/mdevctl.d/scripts.d/
 %dir /etc/mdevctl.d/scripts.d/callouts/
 ###
+%exclude /lib/s390-tools/stage3.bin
+%exclude %{_datadir}/s390-tools/genprotimg/stage3a.bin
+%exclude %{_datadir}/s390-tools/genprotimg/stage3b_reloc.bin
+###
 
 %files -n osasnmpd -f %{_builddir}/%{name}.osasnmp
 %{_libexecdir}/net-snmp/agents/osasnmpd
@@ -785,7 +788,7 @@ done
 
 ### genprotimg
 %files genprotimg-data
-%{_datadir}/s390-tools/genprotimg/check_hostkeydoc
+/lib/s390-tools/stage3.bin
 %{_datadir}/s390-tools/genprotimg/stage3a.bin
 %{_datadir}/s390-tools/genprotimg/stage3b_reloc.bin