diff --git a/products/ioap_m8.mk b/products/ioap_m8.mk
new file mode 100644
index 0000000..767cf28
--- /dev/null
+++ b/products/ioap_m8.mk
@@ -0,0 +1,19 @@
+# Check for target product
+ifeq (ioap_m8,$(TARGET_PRODUCT))
+
+# OVERLAY_TARGET adds overlay asset source
+OVERLAY_TARGET := pa_xxhdpi
+
+# Add bluefa1con bootanim
+PRODUCT_COPY_FILES += \
+    vendor/ioap/prebuilt/1080x1920/bootanimation.zip:system/media/bootanimation.zip
+
+# include PAC common configuration
+include vendor/ioap/config/ioap_common.mk
+
+# Inherit CM device configuration
+$(call inherit-product, device/htc/m8/cm.mk)
+
+PRODUCT_NAME := ioap_m8
+
+endif
diff --git a/vendorsetup.sh b/vendorsetup.sh
index b7fa975..a1c03d8 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -19,6 +19,7 @@ add_lunch_combo ioap_jewel-userdebug
 add_lunch_combo ioap_m7-userdebug
 add_lunch_combo ioap_m7spr-userdebug
 add_lunch_combo ioap_m7vzw-userdebug
+add_lunch_combo ioap_m8-userbebug
 add_lunch_combo ioap_pyramid-userdebug
 add_lunch_combo ioap_ruby-userdebug
 add_lunch_combo ioap_ville-userdebug