diff --git a/arch/arm/lib/pbl.lds.S b/arch/arm/lib/pbl.lds.S
index 53c9ce0..e7a94f9 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 = __image_end - BASE;
+	_barebox_image_size = __piggydata_end - BASE;
 	_barebox_pbl_size = __bss_start - BASE;
 }
diff --git a/images/Makefile b/images/Makefile
index 9bd3caa..aaf7479 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -44,8 +44,7 @@
 
 quiet_cmd_objcopy_bin = OBJCOPYB $@
       cmd_objcopy_bin = \
-		$(OBJCOPY) -O binary $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ && \
-		$(objtree)/scripts/fix_size -f $@
+		$(OBJCOPY) -O binary $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
 
 pbl-lds := $(obj)/pbl.lds
 extra-y += $(pbl-lds)