diff --git a/install_zip/Android.mk b/install_zip/Android.mk
index 2ae1452..9e73e06 100644
--- a/install_zip/Android.mk
+++ b/install_zip/Android.mk
@@ -19,6 +19,11 @@ else
 	MR_ENCRYPTION := false
 endif
 
+MR_DEVICES := $(TARGET_DEVICE)
+ifneq ($(MR_DEVICE_VARIANTS))
+	MR_DEVICES += $(MR_DEVICE_VARIANTS)
+endif
+
 $(MULTIROM_ZIP_TARGET): multirom trampoline fw_mounter signapk bbootimg mrom_kexec_static mrom_adbd $(multirom_extra_dep)
 	@echo
 	@echo
@@ -62,7 +67,7 @@ $(MULTIROM_ZIP_TARGET): multirom trampoline fw_mounter signapk bbootimg mrom_kex
 	cp -a $(TARGET_OUT_OPTIONAL_EXECUTABLES)/bbootimg $(MULTIROM_INST_DIR)/scripts/
 	cp $(PWD)/$(MR_FSTAB) $(MULTIROM_INST_DIR)/multirom/mrom.fstab
 	$(install_zip_path)/extract_boot_dev.sh $(PWD)/$(MR_FSTAB) $(MULTIROM_INST_DIR)/scripts/bootdev
-	$(install_zip_path)/make_updater_script.sh $(TARGET_DEVICE) $(MULTIROM_INST_DIR)/META-INF/com/google/android "Installing MultiROM for"
+	$(install_zip_path)/make_updater_script.sh "$(MR_DEVICES)" $(MULTIROM_INST_DIR)/META-INF/com/google/android "Installing MultiROM for"
 	rm -f $(MULTIROM_ZIP_TARGET).zip $(MULTIROM_ZIP_TARGET)-unsigned.zip
 	cd $(MULTIROM_INST_DIR) && zip -qr ../$(notdir $@)-unsigned.zip *
 	java -jar $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem $(DEFAULT_SYSTEM_DEV_CERTIFICATE).pk8 $(MULTIROM_ZIP_TARGET)-unsigned.zip $(MULTIROM_ZIP_TARGET).zip
@@ -85,7 +90,7 @@ $(MULTIROM_UNINST_TARGET): signapk bbootimg
 	cp -a $(TARGET_OUT_OPTIONAL_EXECUTABLES)/bbootimg $(MULTIROM_UNINST_DIR)/scripts/
 	$(install_zip_path)/extract_boot_dev.sh $(PWD)/$(MR_FSTAB) $(MULTIROM_UNINST_DIR)/scripts/bootdev
 	echo $(MR_RD_ADDR) > $(MULTIROM_UNINST_DIR)/scripts/rd_addr
-	$(install_zip_path)/make_updater_script.sh $(TARGET_DEVICE) $(MULTIROM_UNINST_DIR)/META-INF/com/google/android "MultiROM uninstaller -"
+	$(install_zip_path)/make_updater_script.sh "$(MR_DEVICES)" $(MULTIROM_UNINST_DIR)/META-INF/com/google/android "MultiROM uninstaller -"
 	rm -f $(MULTIROM_UNINST_TARGET).zip $(MULTIROM_UNINST_TARGET)-unsigned.zip
 	cd $(MULTIROM_UNINST_DIR) && zip -qr ../$(notdir $@)-unsigned.zip *
 	java -jar $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem $(DEFAULT_SYSTEM_DEV_CERTIFICATE).pk8 $(MULTIROM_UNINST_TARGET)-unsigned.zip $(MULTIROM_UNINST_TARGET).zip
diff --git a/install_zip/make_updater_script.sh b/install_zip/make_updater_script.sh
index 5cb46d1..145fb47 100755
--- a/install_zip/make_updater_script.sh
+++ b/install_zip/make_updater_script.sh
@@ -9,17 +9,6 @@ if [ "$#" -ne "3" ]; then
     exit 1
 fi
 
-# Some devices have multiple variants, which are almost the same,
-# Example: grouper and tilapia (WiFi and 3G versions of Nexus 7)
-case "$DEVICES" in
-    "grouper")
-        DEVICES="${DEVICES} tilapia"
-        ;;
-    "flo")
-        DEVICES="${DEVICES} deb"
-        ;;
-esac
-
 fail()
 {
     echo make_updater_script.sh has failed: $1