diff --git a/arch/arm/lib/pbl.lds.S b/arch/arm/lib/pbl.lds.S
index e7a94f9..53c9ce0 100644
--- a/arch/arm/lib/pbl.lds.S
+++ b/arch/arm/lib/pbl.lds.S
@@ -95,6 +95,6 @@
 
 	.image_end : { *(.__image_end) }
 
-	_barebox_image_size = __piggydata_end - BASE;
+	_barebox_image_size = __image_end - BASE;
 	_barebox_pbl_size = __bss_start - BASE;
 }
diff --git a/images/Makefile b/images/Makefile
index eeea172..4e82dc9 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -44,7 +44,8 @@
 
 quiet_cmd_objcopy_bin = OBJCOPYB $@
       cmd_objcopy_bin = \
-		$(OBJCOPY) -O binary $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
+		$(OBJCOPY) -O binary $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ && \
+		$(objtree)/scripts/fix_size -i -f $@
 
 pbl-lds := $(obj)/pbl.lds
 extra-y += $(pbl-lds)
diff --git a/scripts/fix_size.c b/scripts/fix_size.c
index 7014a3f..cb074e3 100644
--- a/scripts/fix_size.c
+++ b/scripts/fix_size.c
@@ -68,11 +68,12 @@
 	}
 
 	if (strcmp(magic, "barebox")) {
-		fprintf(stderr, "invalid magic\n");
-		if (ignore_unknown)
+		if (ignore_unknown) {
 			ret = 0;
-		else
+		} else {
+			fprintf(stderr, "invalid magic\n");
 			ret = 1;
+		}
 		goto err;
 	}