diff --git a/core/Makefile b/core/Makefile
index 876e1d878e..d8ad169d50 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -6554,6 +6554,7 @@ $(BUILT_TARGET_FILES_DIR): \
 	    $(INSTALLED_PVMFW_EMBEDDED_AVBKEY_TARGET) \
 	    $(INSTALLED_CUSTOMIMAGES_TARGET) \
 	    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \
+	    $(INSTALLED_ANDROID_INFO_EXTRA_TXT_TARGET) \
 	    $(INSTALLED_RECOVERY_KERNEL_TARGET) \
 	    $(INSTALLED_KERNEL_TARGET) \
 	    $(INSTALLED_RAMDISK_TARGET) \
@@ -6791,6 +6792,7 @@ endif
 	@# Extra contents of the OTA package
 	$(hide) mkdir -p $(zip_root)/OTA
 	$(hide) cp $(INSTALLED_ANDROID_INFO_TXT_TARGET) $(zip_root)/OTA/
+	$(hide) cp $(INSTALLED_ANDROID_INFO_EXTRA_TXT_TARGET) $(zip_root)/OTA/
 ifdef BUILDING_RAMDISK_IMAGE
 ifeq (true,$(BOARD_IMG_USE_RAMDISK))
 	@# Contents of the ramdisk image
@@ -7090,6 +7092,7 @@ $(call declare-container-license-deps,$(BUILT_TARGET_FILES_PACKAGE), $(INSTALLED
             $(INSTALLED_PVMFW_EMBEDDED_AVBKEY_TARGET) \
             $(INSTALLED_CUSTOMIMAGES_TARGET) \
             $(INSTALLED_ANDROID_INFO_TXT_TARGET) \
+            $(INSTALLED_ANDROID_INFO_EXTRA_TXT_TARGET) \
             $(INSTALLED_KERNEL_TARGET) \
             $(INSTALLED_RAMDISK_TARGET) \
             $(INSTALLED_DTBIMAGE_TARGET) \
diff --git a/target/board/Android.mk b/target/board/Android.mk
index 8133af9a7f..4fbfeef2f2 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -49,6 +49,23 @@ endif
 
 $(call declare-0p-target,$(INSTALLED_ANDROID_INFO_TXT_TARGET))
 
+# Similarly to above, generate a file containing extra info
+# to be used only with custom releasetools
+INSTALLED_ANDROID_INFO_EXTRA_TXT_TARGET := $(PRODUCT_OUT)/android-info-extra.txt
+android_info_extra_txt := $(TARGET_ANDROID_INFO_EXTRA_FILE)
+ifndef android_info_extra_txt
+android_info_extra_txt := $(wildcard $(TARGET_DEVICE_DIR)/android-info-extra.txt)
+endif
+$(INSTALLED_ANDROID_INFO_EXTRA_TXT_TARGET): $(android_info_extra_txt)
+	$(call pretty,"Generated: ($@)")
+ifdef android_info_extra_txt
+	$(hide) grep -v '#' $< > $@
+else
+	$(hide) echo "" > $@
+endif
+
+$(call declare-0p-target,$(INSTALLED_ANDROID_INFO_EXTRA_TXT_TARGET))
+
 # Copy compatibility metadata to the device.
 
 # Device Manifest