diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index b83d622b97..19ca606214 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -48,7 +48,11 @@
 /* Memory layout */
 #define CONFIG_NR_DRAM_BANKS		1
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
+#ifdef CONFIG_ARM64
+#define CONFIG_SYS_TEXT_BASE		0x00080000
+#else
 #define CONFIG_SYS_TEXT_BASE		0x00008000
+#endif
 #define CONFIG_SYS_UBOOT_BASE		CONFIG_SYS_TEXT_BASE
 /*
  * The board really has 256M. However, the VC (VideoCore co-processor) shares