diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index e207b3e..6115e49 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -279,6 +279,11 @@
 	}
 
 	fh = (ffs_file_header_t *)(input->data + fv->header_length);
+	while (fh->file_type == FILETYPE_PAD) {
+		unsigned long offset = (fh->size[2] << 16) | (fh->size[1] << 8) | fh->size[0];
+		ERROR("skipping %d bytes of FV padding\n", offset);
+		fh = (ffs_file_header_t *)(((void*)fh) + offset);
+	}
 	if (fh->file_type != FILETYPE_SEC) {
 		ERROR("Not a usable UEFI firmware volume.\n");
 		INFO("First file in first FV not a SEC core.\n");
@@ -286,6 +291,11 @@
 	}
 
 	cs = (common_section_header_t *)&fh[1];
+	while (cs->section_type == SECTION_RAW) {
+		unsigned long offset = (cs->size[2] << 16) | (cs->size[1] << 8) | cs->size[0];
+		ERROR("skipping %d bytes of section padding\n", offset);
+		cs = (common_section_header_t *)(((void*)cs) + offset);
+	}
 	if (cs->section_type != SECTION_PE32) {
 		ERROR("Not a usable UEFI firmware volume.\n");
 		INFO("Section type not PE32.\n");