diff --git a/build/jam/board/overo/BoardSetup b/build/jam/board/overo/BoardSetup
index 3f90a2e8e7..560edc0d5f 100644
--- a/build/jam/board/overo/BoardSetup
+++ b/build/jam/board/overo/BoardSetup
@@ -8,18 +8,18 @@ HAIKU_BOARD_FDT_NAME = "omap3-overo-tobi" ;
 #
 
 # load address for haiku_loader
-HAIKU_BOARD_LOADER_BASE = 0x80008000 ;
+HAIKU_BOARD_LOADER_BASE = 0x80800000 ;
 # entry points (raw binary, and netbsd loader emulation)
-HAIKU_BOARD_LOADER_ENTRY_RAW = 0x80008000 ;
-HAIKU_BOARD_LOADER_ENTRY_NBSD = 0x80008008 ;
-HAIKU_BOARD_LOADER_ENTRY_LINUX = 0x80008010 ;
+HAIKU_BOARD_LOADER_ENTRY_RAW = 0x80800000 ;
+HAIKU_BOARD_LOADER_ENTRY_NBSD = 0x80800008 ;
+HAIKU_BOARD_LOADER_ENTRY_LINUX = 0x80800010 ;
 
 HAIKU_BOARD_LOADER_ENTRY = $(HAIKU_BOARD_LOADER_ENTRY_NBSD) ;
 HAIKU_BOARD_LOADER_FAKE_OS = netbsd ;
 
 # load address for haiku_loader uimage
 # (must be different than real load address)
-HAIKU_BOARD_LOADER_UIBASE = 0x84000000 ;
+HAIKU_BOARD_LOADER_UIBASE = 0x82800000 ;
 
 #
 # Flash image
@@ -73,9 +73,9 @@ HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT = "\
 setenv bootargs debug_screen true; \
 if mmc rescan; then \
 	fatload mmc 0 0x80100000 $(HAIKU_BOARD_FDT_NAME).dtb ; \
-	fatload mmc 0 0x80200000 haiku-floppyboot.tgz.ub; \
+	fatload mmc 0 0x81200000 haiku-floppyboot.tgz.ub; \
 	fatload mmc 0 $(HAIKU_BOARD_LOADER_UIBASE) haiku_loader_linux.ub; \
-	bootm $(HAIKU_BOARD_LOADER_UIBASE) 0x80200000 0x80100000; \
+	bootm $(HAIKU_BOARD_LOADER_UIBASE) 0x81200000 0x80100000; \
 fi" ;
 
 HAIKU_BOARD_SDIMAGE_FILES =