diff --git a/Makefile b/Makefile
index 7d1891b..3175128 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,11 @@ SRC_DIR=source
 BUILD_DIR=disk_images
 DATA_DIR=data
 
+# CD image
+cdrom: $(BUILD_DIR)/crawos.iso
+$(BUILD_DIR)/crawos.iso: floppy_image
+	mkisofs -quiet -V 'CRAWOS' -input-charset iso8859-1 -o disk_images/crawos.iso -b crawos.img disk_images/
+
 # Floppy image
 # Fat12
 floppy_image: $(BUILD_DIR)/crawos.img
@@ -14,6 +19,7 @@ $(BUILD_DIR)/crawos.img: bootloader kernel
 	mcopy -i $(BUILD_DIR)/crawos.img $(BUILD_DIR)/kernel.bin "::kernel.bin" # Put kernel.bin inside the disk image
 	for filename in $(DATA_DIR)/*; do mcopy -i $(BUILD_DIR)/crawos.img $$filename "::/$$(echo $$filename | xargs -n 1 basename)"; done
 
+
 # Bootloader
 bootloader: $(BUILD_DIR)/boot.bin
 $(BUILD_DIR)/boot.bin:
diff --git a/disk_images/crawos.img b/disk_images/crawos.img
index 1fcadb4..3525e06 100644
Binary files a/disk_images/crawos.img and b/disk_images/crawos.img differ
diff --git a/disk_images/crawos.iso b/disk_images/crawos.iso
new file mode 100644
index 0000000..f60fd17
Binary files /dev/null and b/disk_images/crawos.iso differ