diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 3ba6bcdd9d..783c7d9892 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -653,8 +653,10 @@ static int cbfs_add_integer_component(const char *name,
 	}
 
 	if (cbfs_get_entry(&image, name)) {
-		ERROR("'%s' already in ROM image.\n", name);
-		goto done;
+		if (cbfs_remove_entry(&image, name) != 0) {
+			ERROR("Removing file '%s' failed.\n", name);
+			goto done;
+		}
 	}
 
 	header = cbfs_create_file_header(CBFS_TYPE_RAW,