diff --git a/bl1/aarch64/bl1_entrypoint.S b/bl1/aarch64/bl1_entrypoint.S
index 197eac0..8d12045 100644
--- a/bl1/aarch64/bl1_entrypoint.S
+++ b/bl1/aarch64/bl1_entrypoint.S
@@ -30,19 +30,19 @@
 
 #include <arch.h>
 
-	.globl	reset_handler
+	.globl	bl1_entrypoint
 
 
 	.section	.text, "ax"; .align 3
 
 	/* -----------------------------------------------------
-	 * reset_handler() is the entry point into the trusted
+	 * bl1_entrypoint() is the entry point into the trusted
 	 * firmware code when a cpu is released from warm or
 	 * cold reset.
 	 * -----------------------------------------------------
 	 */
 
-reset_handler: ; .type reset_handler, %function
+bl1_entrypoint: ; .type bl1_entrypoint, %function
 	/* ---------------------------------------------
 	 * Perform any processor specific actions upon
 	 * reset e.g. cache, tlb invalidations etc.
diff --git a/bl1/bl1.ld.S b/bl1/bl1.ld.S
index 0663b6f..012ff58 100644
--- a/bl1/bl1.ld.S
+++ b/bl1/bl1.ld.S
@@ -32,6 +32,7 @@
 
 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
 OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
+ENTRY(bl1_entrypoint)
 
 MEMORY {
     ROM (rx): ORIGIN = TZROM_BASE, LENGTH = TZROM_SIZE
diff --git a/bl1/bl1.mk b/bl1/bl1.mk
index bc14ddc..0d5eca7 100644
--- a/bl1/bl1.mk
+++ b/bl1/bl1.mk
@@ -49,5 +49,4 @@
 				bl1_main.c		\
 				cpu_helpers.S
 
-BL1_ENTRY_POINT		:=	reset_handler
 BL1_LINKERFILE		:=	bl1.ld.S