diff --git a/Makefile b/Makefile
index 102f460..946a0e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 .PHONY: quark
-quark: build-dir kernel
+quark: build-dir kernel iso
 
 include config/.conf
 include scripts/toolchain.mk
 include scripts/kernel.mk
 include scripts/run.mk
+include scripts/iso.mk
 
 .PHONY: build-dir
 build-dir:
diff --git a/config/grub.cfg b/config/grub.cfg
new file mode 100644
index 0000000..cf33aa5
--- /dev/null
+++ b/config/grub.cfg
@@ -0,0 +1,3 @@
+menuentry "Quark" {
+    multiboot /boot/kernel.bin
+}
diff --git a/scripts/iso.mk b/scripts/iso.mk
new file mode 100644
index 0000000..e4c12b6
--- /dev/null
+++ b/scripts/iso.mk
@@ -0,0 +1,6 @@
+.PHONY: iso
+iso:
+	@mkdir -p build/iso/boot/grub
+	@cp build/kernel.bin build/iso/boot/kernel.bin
+	@cp config/grub.cfg build/iso/boot/grub/grub.cfg
+	@grub-mkrescue -o build/quark.iso build/iso
diff --git a/scripts/run.mk b/scripts/run.mk
index 904cb18..31e557c 100644
--- a/scripts/run.mk
+++ b/scripts/run.mk
@@ -4,5 +4,5 @@ run: quark run-qemu
 .PHONY: run-qemu
 run-qemu:
 	@echo -e $(ARROW) "Running on qemu..."
-	@qemu-system-i386 -kernel $(BUILD_DIR)/kernel.bin
+	@qemu-system-i386 $(BUILD_DIR)/quark.iso
 	@echo -e $(ARROW) "Finished run"