diff --git a/Makefile b/Makefile
index 90a6441..f3fd8c3 100644
--- a/Makefile
+++ b/Makefile
@@ -267,16 +267,16 @@ OS/K: $(dep) ./ProjectTree $(BINDIR)/kaleid
 
 test: all install
 	@qemu-system-x86_64 -vga std -cpu core2duo -soundhw pcspk -s \
-	 -rtc base=localtime -m $(ram) -hda $(BUILDDIR)/bin/disk.img \
+	 -rtc base=localtime -m $(ram) -hda $(installdisk) \
 	 -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
 
 test32: all install
-	@qemu-system-i386 -m $(ram) -hda $(BUILDDIR)/bin/disk.img -d \
+	@qemu-system-i386 -m $(ram) -hda $(installdisk) -d \
 	 cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
 
 gdb: all install
 	@setsid qemu-system-x86_64 -m $(ram) -soundhw pcspk -rtc base=localtime \
-	 -hda $(BUILDDIR)/bin/disk.img -no-reboot -no-shutdown -d \
+	 -hda $(installdisk) -no-reboot -no-shutdown -d \
 	 cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log &
 	@gdb \
 	-ex "set arch i386:x86-64:intel"   \
@@ -285,7 +285,7 @@ gdb: all install
 	-ex "break BtStartKern"            \
 
 ddd: all install_os_k
-	@setsid qemu-system-x86_64 -m $(ram) -hda $(BUILDDIR)/bin/disk.img -no-reboot -soundhw pcspk \
+	@setsid qemu-system-x86_64 -m $(ram) -hda $(installdisk) -no-reboot -soundhw pcspk \
 	-no-shutdown -d cpu_reset,guest_errors,pcall,int -s 2> $(BUILDDIR)/qemu.log &
 	@ddd
 
@@ -297,9 +297,9 @@ install: $(installdisk) $(MBRDIR)/grub.cfg $(BINDIR)/kaleid
 	@$(BUILDDIR)/install-os-k.sh $(installdisk) $(MBRDIR)/grub.cfg $(BINDIR)/kaleid
 	@echo ${CL2}[$@] ${CL}Success.${CL3}
 
-$(BINDIR)/disk.img: $(BUILDDIR)/create_disk.sh
+$(installdisk): $(BUILDDIR)/create_disk.sh
 	@echo ${CL2}[$@]${NC} Constructing disk image...${CL3}
-	@$(BUILDDIR)/create_disk.sh $(BINDIR)/disk.img
+	@$(BUILDDIR)/create_disk.sh $(installdisk)
 	@echo ${CL2}[$@]${NC} Constructing disk image...${CL3}