diff --git a/Makefile b/Makefile
index 60ef8a2..eaeb098 100644
--- a/Makefile
+++ b/Makefile
@@ -42,15 +42,15 @@ vga11.com: cp437.bin
 
 # COM programs
 %.com: com/%.asm
-	$(NASM) $(NASM_ARGS) -DBASE=0x0100 -DCOM -o $@ $<
+	$(NASM) $(NASM_ARGS) -o $@ $<
 
 # Bootloaders, first sector on partition
 %.bs: boot/%.asm
-	$(NASM) $(NASM_ARGS) -DBASE=0x7C00 -DBOOT -o $@ $<
+	$(NASM) $(NASM_ARGS) -o $@ $<
 
 # BIOS option roms
 %.rom: rom/%.asm utils/fix-rom
-	$(NASM) $(NASM_ARGS) -DBASE=0x0000 -DROM -o $@ $< && utils/fix-rom $@
+	$(NASM) $(NASM_ARGS) -o $@ $< && utils/fix-rom $@
 
 fdimage.img: fat.bs $(DISTFILES)
 	mformat -C -i $@ -f $(FLOPPY) -B fat.bs ::
diff --git a/boot/pxeboot.asm b/boot/pxeboot.asm
index 0808637..ac56fc0 100644
--- a/boot/pxeboot.asm
+++ b/boot/pxeboot.asm
@@ -1,4 +1,4 @@
-org BASE
+org 0x7C00
 
 main:
 	mov ax, [es:bx+0x0A]