diff --git a/Makefile b/Makefile
index 6c4018a..425d573 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,7 @@
 endif
 
 export TARGET := firm
-ENTRY9        := 0x08000054
-ENTRY11       := 0x1FF85040
-SECTION0_ADR  := 0x08000040
 SECTION0_TYPE := 0
-SECTION1_ADR  := 0x1FF85000
 SECTION1_TYPE := 1
 
 
@@ -37,8 +33,13 @@
 
 #---------------------------------------------------------------------------------
 $(TARGET).bin: $(TARGET)9.bin $(TARGET)11.bin
-	firm_builder $(TARGET).bin $(ENTRY9) $(ENTRY11) $(SECTION0_ADR) $(SECTION0_TYPE) \
-		$(TARGET)9.bin $(SECTION1_ADR) $(SECTION1_TYPE) $(TARGET)11.bin
+	firm_builder $(TARGET).bin \
+		$(shell arm-none-eabi-readelf -h $(TARGET)9.elf | grep 'Entry' | sed 's/.*\(0x[0-f]*\)/\1/i') \
+		$(shell arm-none-eabi-readelf -h $(TARGET)11.elf | grep 'Entry' | sed 's/.*\(0x[0-f]*\)/\1/i') \
+		0x$(shell arm-none-eabi-readelf --sections $(TARGET)9.elf | grep '.text' | sed 's/.*ITS\ *\([0-f]*\).*/\1/i') \
+		$(SECTION0_TYPE) $(TARGET)9.bin \
+		0x$(shell arm-none-eabi-readelf --sections $(TARGET)11.elf | grep '.text' | sed 's/.*ITS\ *\([0-f]*\).*/\1/i') \
+		$(SECTION1_TYPE) $(TARGET)11.bin
 
 #---------------------------------------------------------------------------------
 $(TARGET)9.bin:
@@ -57,7 +58,12 @@
 release: clean
 	@$(MAKE) -j4 --no-print-directory -f Makefile.arm9 NO_DEBUG=1
 	@$(MAKE) -j4 --no-print-directory -f Makefile.arm11 NO_DEBUG=1
-	firm_builder $(TARGET).bin $(ENTRY9) $(ENTRY11) $(SECTION0_ADR) $(SECTION0_TYPE) \
-		$(TARGET)9.bin $(SECTION1_ADR) $(SECTION1_TYPE) $(TARGET)11.bin
+	firm_builder $(TARGET).bin \
+		$(shell arm-none-eabi-readelf -h $(TARGET)9.elf | grep 'Entry' | sed 's/.*\(0x[0-f]*\)/\1/i') \
+		$(shell arm-none-eabi-readelf -h $(TARGET)11.elf | grep 'Entry' | sed 's/.*\(0x[0-f]*\)/\1/i') \
+		0x$(shell arm-none-eabi-readelf --sections $(TARGET)9.elf | grep '.text' | sed 's/.*ITS\ *\([0-f]*\).*/\1/i') \
+		$(SECTION0_TYPE) $(TARGET)9.bin \
+		0x$(shell arm-none-eabi-readelf --sections $(TARGET)11.elf | grep '.text' | sed 's/.*ITS\ *\([0-f]*\).*/\1/i') \
+		$(SECTION1_TYPE) $(TARGET)11.bin
 	@7z a -mx -m0=ARM -m1=LZMA2 fastboot3DS$(VERS_STRING).7z $(TARGET).bin
 #	@7z u -mx -m0=LZMA2 fastboot3DS$(VERS_STRING).7z README.md