diff --git a/Makefile b/Makefile
index 1d910fa..9f6139e 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ $(dir_out)/$(name)$(revision).7z: all
 
 $(dir_out)/boot.firm: $(dir_build)/modules.bin $(dir_build)/arm11.elf $(dir_build)/main.elf $(dir_build)/k11_extension.bin
 	@mkdir -p "$(@D)"
-	@firmtool build $@ -D $^ -A 0x1FF60000 0x18000000 -C XDMA XDMA NDMA XDMA
+	@firmtool build $@ -D $^ -A 0x18180000 0x18000000 -C XDMA XDMA NDMA XDMA
 
 $(dir_build)/modules.bin: $(modules)
 	@mkdir -p "$(@D)"
diff --git a/source/firm.c b/source/firm.c
index fbf6db9..5010a11 100755
--- a/source/firm.c
+++ b/source/firm.c
@@ -241,7 +241,7 @@ static inline void mergeSection0(FirmwareType firmType, u32 firmVersion, bool lo
     if(firmType == NATIVE_FIRM && (ISN3DS || firmVersion >= 0x1D))
     {
         //2) Merge that info with our own modules'
-        for(u8 *src = (u8 *)0x1FF60000; src < (u8 *)(0x1FF60000 + LUMA_SECTION0_SIZE); src += srcModuleSize)
+        for(u8 *src = (u8 *)0x18180000; src < (u8 *)(0x18180000 + LUMA_SECTION0_SIZE); src += srcModuleSize)
         {
             const char *name = ((Cxi *)src)->exHeader.systemControlInfo.appTitle;