diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5f9af5f5..6d10620c 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -65,7 +65,11 @@ BOARD_AVB_ENABLE := true
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560
 BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0
+ifneq ($(PRODUCT_INCREASE_INODE_COUNT),true)
 BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := 4096
+else
+BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := 8192
+endif
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 26503790080
 BOARD_PERSISTIMAGE_PARTITION_SIZE := 33554432