diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1a04124aa..ce20114623 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 - Refactor subprocess invocations
 - Resolve RecoveryOS support (Regression resolved in OpenCorePkg)
 - Restore SPI Keyboard and Trackpad support for macOS 14.4 and newer
-  - Applicable for MacBook8,1, MacBookPro13,x and MacBookPro14,x
+  - Applicable for MacBook8,1, MacBookAir7,x and MacBookPro12,1-14,x
 - Restore support for T1 on macOS 14.4 and newer
   - Applicable for MacBookPro13,2, MacBookPro13,3, MacBookPro14,2, MacBookPro14,3
 - Restore support for legacy Metal GPUs on macOS 14.4 and newer
diff --git a/resources/build/misc.py b/resources/build/misc.py
index 58030344bd..9b77e8297f 100644
--- a/resources/build/misc.py
+++ b/resources/build/misc.py
@@ -183,9 +183,9 @@ def _topcase_handling(self) -> None:
         USB/SPI Top Case Handler
         """
 
-        # macOS 14.4 Beta 1 strips SPI-based top case support for USB-C Macs pre-T2
+        # macOS 14.4 Beta 1 strips SPI-based top case support for Broadwell through Kaby Lake MacBooks
         if self.model.startswith("MacBook") and self.model in smbios_data.smbios_dictionary:
-            if self.model == "MacBook8,1" or (cpu_data.CPUGen.skylake <= smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.kaby_lake):
+            if (cpu_data.CPUGen.broadwell <= smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.kaby_lake):
                 logging.info("- Enabling SPI-based top case support")
                 support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleHSSPISupport.kext", self.constants.apple_spi_version, self.constants.apple_spi_path)
                 support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleHSSPIHIDDriver.kext", self.constants.apple_spi_hid_version, self.constants.apple_spi_hid_path)