diff --git a/rhn-client-tools.spec b/rhn-client-tools.spec
index 4ed3582d6a..883f19ab22 100644
--- a/rhn-client-tools.spec
+++ b/rhn-client-tools.spec
@@ -5,9 +5,11 @@ Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version
 URL:     https://github.com/spacewalkproject/spacewalk
 Name: rhn-client-tools
 Version: 2.0.2
-Release: 22%{?dist}
+Release: 23%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
+#BuildArch: noarch
+# see BZ 1617942 for more info as Requires are written into RPM headers
+# there's no way how to do this dynamicaly based on arch, so splitting arches is the only option
 %if 0%{?suse_version}
 BuildRequires: update-desktop-files
 %endif
@@ -363,6 +365,9 @@ make -f Makefile.rhn-client-tools test
 %endif
 
 %changelog
+* Fri Aug 17 2018 Tomas Kasparek <tkasparek@redhat.com> 2.0.2-23
+- Resolves: #1617942 - split into arch package (tkasparek@redhat.com)
+
 * Thu Aug 16 2018 Tomas Kasparek <tkasparek@redhat.com> 2.0.2-22
 - Resolves: #1617942 - drop dmidecode dependency on s390x
   (tkasparek@redhat.com)