diff --git a/bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt b/bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt
index ec11400..e95f4ca 100644
--- a/bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt
+++ b/bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt
@@ -218,7 +218,11 @@ data class VendorBoot(
             }
             val tab = AsciiTable().let {
                 it.addRule()
-                it.addRow("re-packed $imageName", "$imageName.signed")
+                if (File("$imageName.signed").exists()) {
+                    it.addRow("re-packed $imageName", "$imageName.signed")
+                } else {
+                    it.addRow("re-packed $imageName", "$imageName.clear")
+                }
                 it.addRule()
                 it
             }
@@ -313,7 +317,13 @@ data class VendorBoot(
 
     fun sign(): VendorBoot {
         val avbtool = String.format(Helper.prop("avbtool"), "v1.2")
-        Signer.signAVB(info.output, this.info.imageSize, avbtool)
+        File(Avb.getJsonFileName(info.output)).let {
+            if (it.exists()) {
+                Signer.signAVB(info.output, this.info.imageSize, avbtool)
+            } else {
+                log.warn("skip signing of ${info.output}")
+            }
+        }
         return this
     }
 
@@ -415,11 +425,13 @@ data class VendorBoot(
             }
             it.addRule()
             Avb.getJsonFileName(info.output).let { jsonFile ->
-                it.addRow("AVB info", Avb.getJsonFileName(info.output))
                 if (File(jsonFile).exists()) {
+                    it.addRow("AVB info", jsonFile)
                     mapper.readValue(File(jsonFile), AVBInfo::class.java).let { ai ->
                         it.addRow("\\-- signing key", Avb.inspectKey(ai))
                     }
+                } else {
+                    it.addRow("AVB info", "none")
                 }
                 it.addRule()
             }
diff --git a/bbootimg/src/main/kotlin/packable/BootImgParser.kt b/bbootimg/src/main/kotlin/packable/BootImgParser.kt
index 2c41dc6..394eb9e 100644
--- a/bbootimg/src/main/kotlin/packable/BootImgParser.kt
+++ b/bbootimg/src/main/kotlin/packable/BootImgParser.kt
@@ -131,6 +131,7 @@ class BootImgParser : IPackable {
 
     override fun pull(fileName: String, deviceName: String) {
         super.pull(fileName, deviceName)
+        super.pull("vbmeta.img", "vbmeta")
     }
 
     fun clear(fileName: String) {
diff --git a/bbootimg/src/main/kotlin/packable/VendorBootParser.kt b/bbootimg/src/main/kotlin/packable/VendorBootParser.kt
index 07d8a90..66159ff 100644
--- a/bbootimg/src/main/kotlin/packable/VendorBootParser.kt
+++ b/bbootimg/src/main/kotlin/packable/VendorBootParser.kt
@@ -53,6 +53,7 @@ class VendorBootParser : IPackable {
 
     override fun pull(fileName: String, deviceName: String) {
         super.pull(fileName, deviceName)
+        super.pull("vbmeta.img", "vbmeta")
     }
 
     fun clear(fileName: String) {