diff --git a/common.mk b/common.mk
index 83c4f1f..f67e814 100644
--- a/common.mk
+++ b/common.mk
@@ -163,7 +163,7 @@ ifeq ($(OTA),0)
 # for non-OTA, we create two different files for uploading into the flash
 # these are the names and options to generate them
 FW_ADDR_1	= 0x00000
-FW_ADDR_2	= 0x40000
+FW_ADDR_2	= 0x20000
 FW_FILE_1    = $(addprefix $(FW_BASE),$(FW_ADDR_1).bin)
 FW_FILE_2    = $(addprefix $(FW_BASE),$(FW_ADDR_2).bin)
 else
diff --git a/ld/eagle.app.v6.ld b/ld/eagle.app.v6.ld
index 566ad67..f1d11cc 100644
--- a/ld/eagle.app.v6.ld
+++ b/ld/eagle.app.v6.ld
@@ -32,7 +32,7 @@ ets_printf = printf;
 */
 #ifndef OTA
 
-#define IROM0_START 0x40240000
+#define IROM0_START 0x40220000
 
 /* Non-OTA sizes */
 #if FLASH_SIZE == 2 /* 256kB */