diff --git a/comps-f36.xml.in b/comps-f36.xml.in
index 7e3cb4bc..0a0ce1e5 100644
--- a/comps-f36.xml.in
+++ b/comps-f36.xml.in
@@ -2930,7 +2930,7 @@
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">alsa-firmware</packagereq>
       <packagereq arch="aarch64,armhfp" type="optional">bcm283x-firmware</packagereq>
-      <packagereq type="optional">cmospwd</packagereq>
+      <packagereq arch="x86_64" type="optional">cmospwd</packagereq>
       <packagereq type="optional">gpsd</packagereq>
       <packagereq type="optional">gpsd-clients</packagereq>
       <packagereq type="optional">hddtemp</packagereq>
@@ -4757,7 +4757,7 @@
       <packagereq type="default">bmon</packagereq>
       <packagereq type="default">chkrootkit</packagereq>
       <packagereq type="default">ciphertest</packagereq>
-      <packagereq type="default">cmospwd</packagereq>
+      <packagereq arch="x86_64" type="default">cmospwd</packagereq>
       <packagereq type="default">cowpatty</packagereq>
       <packagereq type="default">dc3dd</packagereq>
       <packagereq type="default">dcfldd</packagereq>
diff --git a/comps-f37.xml.in b/comps-f37.xml.in
index fea5d5c0..b1438499 100644
--- a/comps-f37.xml.in
+++ b/comps-f37.xml.in
@@ -2940,7 +2940,7 @@
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">alsa-firmware</packagereq>
       <packagereq arch="aarch64" type="optional">bcm283x-firmware</packagereq>
-      <packagereq type="optional">cmospwd</packagereq>
+      <packagereq arch="x86_64" type="optional">cmospwd</packagereq>
       <packagereq type="optional">gpsd</packagereq>
       <packagereq type="optional">gpsd-clients</packagereq>
       <packagereq type="optional">hddtemp</packagereq>
@@ -4707,7 +4707,7 @@
       <packagereq type="default">bmon</packagereq>
       <packagereq type="default">chkrootkit</packagereq>
       <packagereq type="default">ciphertest</packagereq>
-      <packagereq type="default">cmospwd</packagereq>
+      <packagereq arch="x86_64" type="default">cmospwd</packagereq>
       <packagereq type="default">cowpatty</packagereq>
       <packagereq type="default">dc3dd</packagereq>
       <packagereq type="default">dcfldd</packagereq>
diff --git a/comps-f38.xml.in b/comps-f38.xml.in
index 31c65231..08057fac 100644
--- a/comps-f38.xml.in
+++ b/comps-f38.xml.in
@@ -2887,7 +2887,7 @@
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">alsa-firmware</packagereq>
       <packagereq arch="aarch64" type="optional">bcm283x-firmware</packagereq>
-      <packagereq type="optional">cmospwd</packagereq>
+      <packagereq arch="x86_64" type="optional">cmospwd</packagereq>
       <packagereq type="optional">gpsd</packagereq>
       <packagereq type="optional">gpsd-clients</packagereq>
       <packagereq type="optional">hddtemp</packagereq>