diff --git a/Makefile b/Makefile
index 7f6bbd4..5b72847 100644
--- a/Makefile
+++ b/Makefile
@@ -28,17 +28,17 @@ kernel.com: kernel/*.asm lib/*.inc
 debug.rom: debug/*.asm lib/*.inc
 	nasm -s -o $@ -I lib -I debug debug/main.asm && scripts/fix-rom.sh $@
 
-boot/%.bin: boot/%.asm lib/*.inc
-	nasm -s -o $@ -I boot -I lib $<
+floppy.bs: boot/fatvbr.asm
+	nasm -s -o $@ $<
 
-fdimage.img: boot/floppy.bin kernel.com
+fdimage.img: floppy.bs kernel.com
 	dd if=/dev/zero bs=512 count=$$(( $(FD_CYLINDERS) * $(FD_HEADS) * $(FD_SECTORS) )) of=$@
-	mformat -i $@ -t $(FD_CYLINDERS) -h $(FD_HEADS) -n $(FD_SECTORS) -B boot/floppy.bin ::
+	mformat -i $@ -t $(FD_CYLINDERS) -h $(FD_HEADS) -n $(FD_SECTORS) -B floppy.bs ::
 	mcopy -i $@ kernel.com ::kernel.com
 	mattrib -i $@ +s ::kernel.com
 
 clean:
-	rm -f *.com *.bin *.rom *.img *.log boot/*.bin
+	rm -f *.com *.bin *.rom *.img *.log *.bs *.lst
 
 qemu-rom: kernel.rom $(DEBUGROM)
 	$(QEMU) $(QEMU_ARGS) -option-rom kernel.rom
diff --git a/boot/floppy.asm b/boot/fatvbr.asm
similarity index 100%
rename from boot/floppy.asm
rename to boot/fatvbr.asm