diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2ad9975143a95725c6b762df8670d60a0eb2ee76..aba00479e27ad17e6a0b63e64ee746864dc0e1b0 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -264,6 +264,10 @@ TARGET_COPY_OUT_PRODUCT := product
 # recovery.img
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x06000000
 
+# super.img
+BOARD_BUILD_SUPER_IMAGE := true
+BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true
+
 # system.img
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
 
diff --git a/device.mk b/device.mk
index 94cf0b96b427ac2a7ec2d3650f93b7a063cb3b6a..ed35fd6edc8119bf240d64a1428c32ffec7df28a 100644
--- a/device.mk
+++ b/device.mk
@@ -37,6 +37,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_USE_DYNAMIC_PARTITIONS := true
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
 
+PRODUCT_BUILD_SUPER_PARTITION := true
+
 #####
 
 # A/B - post