diff --git a/Android.mk b/Android.mk
index 1a547f6..636ef20 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,15 +1,35 @@
+# vendor/magisk/Android.mk
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-
-LOCAL_MODULE := magisk
-LOCAL_SRC_FILES := magisk.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/init/magisk
-
-LOCAL_ENFORCE_USES_LIBRARIES := false
-LOCAL_DEX_PREOPT := false
-
+LOCAL_MODULE            := magisk_apk_flat
+LOCAL_SRC_FILES         := magisk.apk
+LOCAL_MODULE_CLASS      := ETC
+LOCAL_MODULE_STEM       := magisk.apk
+LOCAL_MODULE_PATH       := $(TARGET_OUT)/etc/init/magisk
 include $(BUILD_PREBUILT)
+
+define install_exec
+include $(CLEAR_VARS)
+LOCAL_MODULE            := $(1)_bin
+LOCAL_SRC_FILES         := $(1)
+LOCAL_MODULE_CLASS      := EXECUTABLES
+LOCAL_MODULE_STEM       := $(1)
+LOCAL_MODULE_PATH       := $(TARGET_OUT)/etc/init/magisk
+include $(BUILD_PREBUILT)
+endef
+
+$(call install_exec,busybox)
+$(call install_exec,init-ld)
+$(call install_exec,magisk)
+$(call install_exec,magisk64)
+$(call install_exec,magiskboot)
+$(call install_exec,magiskinit)
+$(call install_exec,magiskpolicy)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := magisk
+LOCAL_REQUIRED_MODULES := \
+    magisk_apk_flat \
+    busybox_bin init-ld_bin magisk_bin magisk64_bin magiskboot_bin magiskinit_bin magiskpolicy_bin
+include $(BUILD_PHONY_PACKAGE)
diff --git a/device.mk b/device.mk
index c0a6ce3..d5142e8 100644
--- a/device.mk
+++ b/device.mk
@@ -1,11 +1,12 @@
 PRODUCT_PACKAGES += \
-    magisk
+    magisk_apk_flat \
+    busybox_bin \
+    init-ld_bin \
+    magisk_bin \
+    magisk64_bin \
+    magiskboot_bin \
+    magiskinit_bin \
+    magiskpolicy_bin
 
 PRODUCT_COPY_FILES += \
-    $(shell mkdir -p $(TARGET_OUT)/sbin) \
-    vendor/magisk/magisk.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk.rc \
-    vendor/magisk/magisk:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magisk \
-    vendor/magisk/magiskpolicy:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magiskpolicy \
-    vendor/magisk/magiskboot:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magiskboot \
-    vendor/magisk/magiskinit:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magiskinit \
-    vendor/magisk/busybox:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/busybox
+    vendor/magisk/magisk.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk.rc:0644