diff --git a/etc/archboot/x86_64.conf b/etc/archboot/x86_64.conf
index b9999cf85..d51b05db3 100644
--- a/etc/archboot/x86_64.conf
+++ b/etc/archboot/x86_64.conf
@@ -11,7 +11,7 @@ FILES=()
 #
 # Please change the hooks only if you know what you are doing.
 HOOKS=(archboot_kms udev archboot_base_common archboot_base archboot_installer_common \
-archboot_installer archboot_tz archboot_keymap archboot_acpi archboot_motd archboot_intel_wireless \
+archboot_installer archboot_tz archboot_keymap archboot_acpi archboot_motd \
 archboot_hwdetect block archboot_pcspkr archboot_net_common archboot_net keyboard \
 dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 encrypt \
 btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec archboot_ppp \
diff --git a/usr/lib/initcpio/install/archboot_intel_wireless b/usr/lib/initcpio/install/archboot_intel_wireless
deleted file mode 100644
index 7e0289096..000000000
--- a/usr/lib/initcpio/install/archboot_intel_wireless
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-
-build ()
-{
-    # ipw2100 support
-    map add_file "/usr/lib/firmware/ipw2100-1.3-i.fw" "/usr/lib/firmware/ipw2100-1.3-p.fw" \
-        "/usr/lib/firmware/ipw2100-1.3.fw" "/usr/share/licenses/ipw2100-fw/LICENSE"
-    # ipw2200 support
-    map add_file "/usr/lib/firmware/ipw2200-bss.fw" "/usr/lib/firmware/ipw2200-ibss.fw" \
-        "/usr/lib/firmware/ipw2200-sniffer.fw" "/usr/share/licenses/ipw2200-fw/LICENSE"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook includes intel wireless on an archboot image.
-HELPEOF
-}
diff --git a/usr/lib/initcpio/install/archboot_wireless b/usr/lib/initcpio/install/archboot_wireless
index 5c7eef896..1362764b3 100644
--- a/usr/lib/initcpio/install/archboot_wireless
+++ b/usr/lib/initcpio/install/archboot_wireless
@@ -19,8 +19,10 @@ build ()
     map add_file "/etc/conf.d/wireless-regdom" "/usr/lib/crda/regulatory.bin" \
                  "/usr/lib/crda/pubkeys/sforshee.key.pub.pem"
     # fixing licenses
-    map add_file "/usr/share/licenses/expat/COPYING" \
-        "/usr/share/licenses/wireless-regdb/LICENSE"
+    map add_file "/usr/share/licenses/expat/COPYING" "/usr/share/licenses/wireless-regdb/LICENSE"
+    if [[ "$(uname -m)" == "x86_64" ]]; then
+        map add_file "/usr/share/licenses/ipw2200-fw/LICENSE" "/usr/share/licenses/ipw2100-fw/LICENSE"
+    fi
 
 }