diff --git a/package/system/fwtool/Makefile b/package/system/fwtool/Makefile
index 283be8d77a..901081c1f4 100644
--- a/package/system/fwtool/Makefile
+++ b/package/system/fwtool/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fwtool
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_FLAGS:=nonshared
 
diff --git a/package/system/fwtool/src/fwtool.c b/package/system/fwtool/src/fwtool.c
index 12840e1b91..e77b8b58e1 100644
--- a/package/system/fwtool/src/fwtool.c
+++ b/package/system/fwtool/src/fwtool.c
@@ -322,14 +322,12 @@ extract_data(const char *name)
 		if (extract_tail(&dbuf, &tr, sizeof(tr)))
 			break;
 
+		data_len = be32_to_cpu(tr.size) - sizeof(tr);
 		if (tr.magic != cpu_to_be32(FWIMAGE_MAGIC)) {
 			msg("Data not found\n");
-			metadata_keep = true;
 			break;
 		}
 
-		data_len = be32_to_cpu(tr.size) - sizeof(tr);
-
 		if (be32_to_cpu(tr.crc32) != tail_crc32(&dbuf, crc32)) {
 			msg("CRC error\n");
 			break;