diff --git a/grub2-rpmlintrc b/grub2-rpmlintrc
new file mode 100644
index 0000000..17aba33
--- /dev/null
+++ b/grub2-rpmlintrc
@@ -0,0 +1 @@
+addFilter('arch-independent-package-contains-binary-or-object')
diff --git a/grub2.changes b/grub2.changes
index 3f3f571..aaa33cb 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug  6 09:02:45 UTC 2018 - josef.moellers@suse.com
+
+- The grubxenarch packages are now architecture-independent.
+  [bsc#953297, grub2.spec, grub2-rpmlintrc]
+
 -------------------------------------------------------------------
 Tue Jul 24 07:56:02 UTC 2018 - mchang@suse.com
 
diff --git a/grub2.spec b/grub2.spec
index 9bc1d09..ce594dc 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -161,6 +161,7 @@ Source16:       grub2-xen-pv-firmware.cfg
 # required hook for systemd-sleep (bsc#941758)
 Source17:       grub2-systemd-sleep.sh
 Source18:       grub2-check-default.sh
+Source999:      grub2-rpmlintrc
 Source1000:     PATCH_POLICY
 Patch1:         rename-grub-info-file-to-grub2.patch
 Patch2:         grub2-linux.patch
@@ -414,6 +415,7 @@ Summary:        Bootloader with support for Linux, Multiboot and more
 Group:          System/Boot
 Provides:       %{name}-xen = %{version}-%{release}
 Obsoletes:      %{name}-xen < %{version}-%{release}
+BuildArch:      noarch
 
 %description %{grubxenarch}
 The GRand Unified Bootloader (GRUB) is a highly configurable and customizable