diff --git a/Makefile b/Makefile
index c81cbf3..289e032 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,20 @@
-QEMU=qemu-system-i386
-ASM=./drivers/nvme/nvme.asm
-NVME_SYS=./drivers/nvme/nvme.sys
+MCOPY := mcopy
+QEMU := qemu-system-i386
+NVME_INC := ./drivers/nvme/nvme.inc ./drivers/nvme/macros.inc
+NVME_ASM := ./drivers/nvme/nvme.asm
+NVME_SYS := ./drivers/nvme/nvme.sys
 
-all: MOUNT
+all: $(NVME_SYS)
 .PHONY: all
 
-run: MOUNT
+run: $(NVME_SYS)
 	$(QEMU) -m 128 -fda ./kolibri.img -boot a -drive file=nvm.img,if=none,id=nvm -device nvme,serial=deadbeef,drive=nvm
 .PHONY: run
 
-MOUNT: $(NVME_SYS)
-	@mcopy -moi kolibri.img $(NVME_SYS) ::DRIVERS/NVME.SYS
-.PHONY: MOUNT
-
-$(NVME_SYS): $(ASM)
+$(NVME_SYS): $(NVME_ASM) $(NVME_INC)
 	@cd ./drivers/nvme && $(MAKE)
+	@$(MCOPY) -moi kolibri.img $(NVME_SYS) ::DRIVERS/NVME.SYS
 
+clean:
+	@cd ./drivers/nvme && $(MAKE) clean
+.PHONY: clean
diff --git a/drivers/nvme/Makefile b/drivers/nvme/Makefile
index 8680eb0..6e38159 100644
--- a/drivers/nvme/Makefile
+++ b/drivers/nvme/Makefile
@@ -1,9 +1,12 @@
+RM = rm
 FASM = fasm
 KPACK = kpack
 
 all:
-	$(FASM) nvme.asm
-	$(KPACK) nvme.sys
+	@$(FASM) nvme.asm
+	@$(KPACK) nvme.sys
+.PHONY: all
 
 clean:
-	rm *.sys
+	@$(RM) ./*.sys
+.PHONY: clean