diff --git a/Android.mk b/Android.mk
index 9730284..2f77dfa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -127,11 +127,24 @@ BOOT_RAMDISK_INIT_SRC := $(LOCAL_PATH)/init-script
 BOOT_RAMDISK_INIT := $(BOOT_INTERMEDIATE)/init
 BOOT_RAMDISK_FILES := $(shell find $(BOOT_RAMDISK_SRC) -type f) $(BOOT_RAMDISK_INIT)

+ifneq (,$(strip $(BOARD_CUSTOM_BOOTIMG_MK)))
+include $(BOARD_CUSTOM_BOOTIMG_MK)
+endif
+
+ifneq (,$(strip $(BOARD_CUSTOM_BOOTIMG_MK)))
+$(LOCAL_BUILT_MODULE): $(INSTALLED_KERNEL_TARGET) $(BOOT_RAMDISK) $(MKBOOTIMG) $(INSTALLED_BOOTIMAGE_TARGET)
+else
 $(LOCAL_BUILT_MODULE): $(INSTALLED_KERNEL_TARGET) $(BOOT_RAMDISK) $(MKBOOTIMG)
+endif
 	@echo "Making hybris-boot.img in $(dir $@) using $(INSTALLED_KERNEL_TARGET) $(BOOT_RAMDISK)"
 	@mkdir -p $(dir $@)
 	@rm -rf $@
+ifneq (,$(strip $(BOARD_CUSTOM_BOOTIMG_MK)))
+	@mv $(INSTALLED_BOOTIMAGE_TARGET) $@
+	@mv $(INSTALLED_RAMDISK_TARGET) $(BOOT_RAMDISK)
+else
 	$(hide)$(MKBOOTIMG) --ramdisk $(BOOT_RAMDISK) $(HYBRIS_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@
+endif

 $(BOOT_RAMDISK): $(BOOT_RAMDISK_FILES) $(BB_STATIC)
 	@echo "Making initramfs : $@"
@@ -170,11 +183,24 @@ RECOVERY_RAMDISK_INIT_SRC := $(LOCAL_PATH)/init-script
 RECOVERY_RAMDISK_INIT := $(RECOVERY_INTERMEDIATE)/init
 RECOVERY_RAMDISK_FILES := $(shell find $(RECOVERY_RAMDISK_SRC) -type f) $(RECOVERY_RAMDISK_INIT)

+ifneq (,$(strip $(BOARD_CUSTOM_BOOTIMG_MK)))
+include $(BOARD_CUSTOM_BOOTIMG_MK)
+endif
+
+ifneq (,$(strip $(BOARD_CUSTOM_BOOTIMG_MK)))
+$(LOCAL_BUILT_MODULE): $(INSTALLED_KERNEL_TARGET) $(RECOVERY_RAMDISK) $(MKBOOTIMG) $(INSTALLED_BOOTIMAGE_TARGET)
+else
 $(LOCAL_BUILT_MODULE): $(INSTALLED_KERNEL_TARGET) $(RECOVERY_RAMDISK) $(MKBOOTIMG)
+endif
 	@echo "Making hybris-recovery.img in $(dir $@) using $(INSTALLED_KERNEL_TARGET) $(RECOVERY_RAMDISK)"
 	@mkdir -p $(dir $@)
 	@rm -rf $@
+	@cp $(BB_STATIC) $(RECOVERY_INTERMEDIATE)/initramfs/bin/
+ifneq (,$(strip $(BOARD_CUSTOM_BOOTIMG_MK)))
+	@mv $(INSTALLED_BOOTIMAGE_TARGET) $@
+else
 	$(hide)$(MKBOOTIMG) --ramdisk $(RECOVERY_RAMDISK) $(HYBRIS_RECOVERYIMAGE_ARGS) $(BOARD_MKRECOVERYIMG_ARGS) --output $@
+endif

 $(RECOVERY_RAMDISK): $(RECOVERY_RAMDISK_FILES) $(BB_STATIC)
 	@echo "Making initramfs : $@"