diff --git a/common.mk b/common.mk
index 551d2f1..9f40521 100644
--- a/common.mk
+++ b/common.mk
@@ -60,15 +60,10 @@ PRODUCT_COPY_FILES +=  \
     vendor/aosp/prebuilt/common/media/PFFprec_600.emd:system/media/PFFprec_600.emd
 
 # SuperSU
-ifeq ($(BOARD_VENDOR),sony)
+PRODUCT_PACKAGES += \
+    UPDATE-SuperSU.zip
 PRODUCT_COPY_FILES += \
-    vendor/aosp/prebuilt/common/etc/UPDATE-SuperSU-2.52.zip:system/addon.d/UPDATE-SuperSU.zip \
     vendor/aosp/prebuilt/common/etc/init.d/99SuperSUDaemon:system/etc/init.d/99SuperSUDaemon
-else
-PRODUCT_COPY_FILES += \
-   vendor/aosp/prebuilt/common/etc/UPDATE-SuperSU.zip:system/addon.d/UPDATE-SuperSU.zip \
-   vendor/aosp/prebuilt/common/etc/init.d/99SuperSUDaemon:system/etc/init.d/99SuperSUDaemon
-endif
 
 # Substratum
 PRODUCT_COPY_FILES += \
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
new file mode 100644
index 0000000..d3f30a4
--- /dev/null
+++ b/prebuilt/common/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH := $(call my-dir)
+
+# UPDATE-SuperSU
+include $(CLEAR_VARS)
+LOCAL_MODULE := UPDATE-SuperSU.zip
+
+ifneq ($(filter viskan blue,$(BOARD_VENDOR_PLATFORM)),)
+LOCAL_SRC_FILES := addon.d/UPDATE-SuperSU-systemmode.zip
+else
+LOCAL_SRC_FILES := addon.d/UPDATE-SuperSU.zip
+endif
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_PATH := $(TARGET_OUT)/addon.d
+include $(BUILD_PREBUILT)
diff --git a/prebuilt/common/addon.d/UPDATE-SuperSU-systemmode.zip b/prebuilt/common/addon.d/UPDATE-SuperSU-systemmode.zip
new file mode 100644
index 0000000..87cda97
Binary files /dev/null and b/prebuilt/common/addon.d/UPDATE-SuperSU-systemmode.zip differ
diff --git a/prebuilt/common/etc/UPDATE-SuperSU.zip b/prebuilt/common/addon.d/UPDATE-SuperSU.zip
similarity index 100%
rename from prebuilt/common/etc/UPDATE-SuperSU.zip
rename to prebuilt/common/addon.d/UPDATE-SuperSU.zip
diff --git a/prebuilt/common/etc/UPDATE-SuperSU-2.52.zip b/prebuilt/common/etc/UPDATE-SuperSU-2.52.zip
deleted file mode 100644
index 2873ff7..0000000
Binary files a/prebuilt/common/etc/UPDATE-SuperSU-2.52.zip and /dev/null differ