diff --git a/products/cyanogen_mecha.mk b/products/cyanogen_mecha.mk
index 65e3d75..8ad395e 100644
--- a/products/cyanogen_mecha.mk
+++ b/products/cyanogen_mecha.mk
@@ -20,6 +20,9 @@
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
+# Add AicBootFix
+PRODUCT_PACKAGES += AicBootFix
+
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
diff --git a/products/cyanogen_speedy.mk b/products/cyanogen_speedy.mk
index fa279f7..fde19d6 100644
--- a/products/cyanogen_speedy.mk
+++ b/products/cyanogen_speedy.mk
@@ -4,6 +4,9 @@
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
+# Inherit WiMAX stuff
+$(call inherit-product, vendor/cyanogen/products/wimax.mk)
+
 #
 # Setup device specific product configuration.
 #
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
index 77f5b99..2fea4c5 100644
--- a/products/cyanogen_supersonic.mk
+++ b/products/cyanogen_supersonic.mk
@@ -4,6 +4,9 @@
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
+# Inherit WiMAX stuff
+$(call inherit-product, vendor/cyanogen/products/wimax.mk)
+
 #
 # Setup device specific product configuration.
 #
diff --git a/products/wimax.mk b/products/wimax.mk
new file mode 100644
index 0000000..cf1aff1
--- /dev/null
+++ b/products/wimax.mk
@@ -0,0 +1,2 @@
+# Required packages for WiMAX
+PRODUCT_PACKAGES += CMWimaxSettings