diff --git a/arch/arm/boards/avnet-zedboard/flash_header.c b/arch/arm/boards/avnet-zedboard/flash_header.c
index ea20524..d9eb35b 100644
--- a/arch/arm/boards/avnet-zedboard/flash_header.c
+++ b/arch/arm/boards/avnet-zedboard/flash_header.c
@@ -52,10 +52,10 @@
 	.enc_stat		= 0x0,
 	.user			= 0x0,
 	.flash_offset		= 0x8c0,
-	.length			= barebox_image_size,
+	.length			= (unsigned int)&_barebox_image_size,
 	.res0			= 0x0,
 	.start_of_exec		= 0x0,
-	.total_len		= barebox_image_size,
+	.total_len		= (unsigned int)&_barebox_image_size,
 	.res1			= 0x1,
 	.checksum		= 0x0,
 	.res2			= 0x0,
diff --git a/arch/arm/boards/friendlyarm-tiny210/lowlevel.c b/arch/arm/boards/friendlyarm-tiny210/lowlevel.c
index 3ab8d66..fea00ef 100644
--- a/arch/arm/boards/friendlyarm-tiny210/lowlevel.c
+++ b/arch/arm/boards/friendlyarm-tiny210/lowlevel.c
@@ -97,7 +97,7 @@
 	debug_led(1, 1);
 
 	if (! load_stage2((void*)(ld_var(_text) - 16),
-				ld_var(_barebox_image_size) + 16)) {
+				barebox_image_size + 16)) {
 		debug_led(3, 1);
 		while (1) { } /* hang */
 	}
diff --git a/arch/arm/cpu/common.c b/arch/arm/cpu/common.c
index 46ce942..dcd8f0b 100644
--- a/arch/arm/cpu/common.c
+++ b/arch/arm/cpu/common.c
@@ -78,3 +78,6 @@
 	return __cpu_architecture;
 }
 #endif
+
+char __image_start[0] __attribute__((section(".__image_start")));
+char __image_end[0] __attribute__((section(".__image_end")));
\ No newline at end of file
diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h
index e8dfd02..3aea2e0 100644
--- a/arch/arm/include/asm/barebox-arm.h
+++ b/arch/arm/include/asm/barebox-arm.h
@@ -179,4 +179,6 @@
  */
 #define MAX_BSS_SIZE SZ_1M
 
+#define barebox_image_size (__image_end - __image_start)
+
 #endif	/* _BAREBOX_ARM_H_ */
diff --git a/arch/arm/lib32/barebox.lds.S b/arch/arm/lib32/barebox.lds.S
index 6dc8bd2..5fd39dc 100644
--- a/arch/arm/lib32/barebox.lds.S
+++ b/arch/arm/lib32/barebox.lds.S
@@ -30,6 +30,7 @@
 #else
 	. = TEXT_BASE;
 #endif
+	.image_start : { *(.__image_start) }
 
 #ifndef CONFIG_PBL_IMAGE
 	PRE_IMAGE
@@ -116,6 +117,7 @@
 	}
 
 	_edata = .;
+	.image_end : { *(.__image_end) }
 
 	. = ALIGN(4);
 	__bss_start = .;
diff --git a/arch/arm/lib32/runtime-offset.S b/arch/arm/lib32/runtime-offset.S
index f10c4c8..7375cb9 100644
--- a/arch/arm/lib32/runtime-offset.S
+++ b/arch/arm/lib32/runtime-offset.S
@@ -39,7 +39,6 @@
 ld_var_entry __rel_dyn_end
 ld_var_entry __dynsym_start
 ld_var_entry __dynsym_end
-ld_var_entry _barebox_image_size
 ld_var_entry __bss_start
 ld_var_entry __bss_stop
 #ifdef __PBL__
diff --git a/drivers/mtd/nand/nand_s3c24xx.c b/drivers/mtd/nand/nand_s3c24xx.c
index 83d4517..df22735 100644
--- a/drivers/mtd/nand/nand_s3c24xx.c
+++ b/drivers/mtd/nand/nand_s3c24xx.c
@@ -614,7 +614,7 @@
 void __nand_boot_init nand_boot(void)
 {
 	void *dest = _text;
-	int size = ld_var(_barebox_image_size);
+	int size = barebox_image_size;
 	int page = 0;
 
 	s3c24x0_nand_load_image(dest, size, page);
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h
index 984f8b6..0eb18f6 100644
--- a/include/asm-generic/sections.h
+++ b/include/asm-generic/sections.h
@@ -6,12 +6,13 @@
 extern char _sdata[], _edata[];
 extern char __bare_init_start[], __bare_init_end[];
 extern char _end[];
+extern char __image_start[];
 extern char __image_end[];
 extern void *_barebox_image_size;
 extern void *_barebox_bare_init_size;
 extern void *_barebox_pbl_size;
 
-#define barebox_image_size	(unsigned int)&_barebox_image_size
+#define barebox_image_size	(__image_end - __image_start)
 #define barebox_bare_init_size	(unsigned int)&_barebox_bare_init_size
 #define barebox_pbl_size	(unsigned int)&_barebox_pbl_size