diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..df3f521
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,18 @@
+
+HOS = hos
+MKISOFS = genisoimage
+ISO = $(HOS).iso
+
+.PHONY: kernel iso
+
+# default target: build the kernel and ISO image
+all: kernel iso
+
+# build the kernel
+kernel:
+	make -C kernel
+
+# build the ISO image
+iso: kernel
+	$(MKISOFS) -R -b boot/grub/stage2_eltorito -no-emul-boot \
+		-boot-load-size 4 -boot-info-table -o $(ISO) iso
diff --git a/iso/boot/grub/stage2_eltorito b/iso/boot/grub/stage2_eltorito
new file mode 100644
index 0000000..7239d0e
Binary files /dev/null and b/iso/boot/grub/stage2_eltorito differ
diff --git a/kernel/Makefile b/kernel/Makefile
new file mode 100644
index 0000000..53ff566
--- /dev/null
+++ b/kernel/Makefile
@@ -0,0 +1,3 @@
+
+all:
+	@echo Nothing yet