diff --git a/install/config/all.sh b/install/config/all.sh
index 8a44517..4118e40 100644
--- a/install/config/all.sh
+++ b/install/config/all.sh
@@ -24,3 +24,4 @@ run_logged $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh
 run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm4360.sh
+run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-spi-keyboard.sh
diff --git a/install/config/hardware/fix-apple-spi-keyboard.sh b/install/config/hardware/fix-apple-spi-keyboard.sh
new file mode 100644
index 0000000..f549669
--- /dev/null
+++ b/install/config/hardware/fix-apple-spi-keyboard.sh
@@ -0,0 +1,7 @@
+# Detect MacBook models that need SPI keyboard modules
+if [[ "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" =~ MacBook12,1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then
+  echo "Detected MacBook with SPI keyboard"
+
+  sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms
+  echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
+fi
diff --git a/install/omarchy-other.packages b/install/omarchy-other.packages
index a648453..d858a96 100644
--- a/install/omarchy-other.packages
+++ b/install/omarchy-other.packages
@@ -26,6 +26,7 @@ limine-snapper-sync
 linux
 linux-firmware
 linux-headers
+macbook12-spi-driver-dkms
 nvidia-dkms
 nvidia-open-dkms
 nvidia-utils