diff --git a/Makefile b/Makefile
index acb14ec..8c89003 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
 #Some definitions
 SRC_DIR = src
 BUILD_DIR = build
+LOADER_DIR = module_bootloader
 
 KERNEL_MAIN = $(SRC_DIR)/main.c
 KERNEL_MAIN_OBJ = $(BUILD_DIR)/main.o
@@ -12,12 +13,11 @@ ENTRY_ASM_OBJ = $(BUILD_DIR)/start.o
 
 LINKING_RECIPE = $(SRC_DIR)/linker.ld
 
-KERNEL_IMG = $(BUILD_DIR)/mykernel.elf
+KERNEL_IMG = $(BUILD_DIR)/ukern.elf
 
 QEMU = qemu-system-i386
 GCC = i686-elf-gcc
 
-
 #Actual recipe
 all: $(KERNEL_IMG)
 
@@ -37,6 +37,13 @@ $(KERNEL_IMG): $(KERNEL_MAIN_OBJ) $(ENTRY_ASM_OBJ)
 run: all
 	$(QEMU) -kernel $(KERNEL_IMG)
 
-clean:
-	rm -rf $(BUILD_DIR)/*
+iso: all
+	mv $(KERNEL_IMG) $(LOADER_DIR)/src/boot/; \
+	cd $(LOADER_DIR);	\
+	make all;			\
+	cd ..;				\
+	mv $(LOADER_DIR)/build/uOS.iso $(BUILD_DIR)/
+
+clean:
+	rm -rf $(BUILD_DIR)/* 
 
diff --git a/module_bootloader/Makefile b/module_bootloader/Makefile
new file mode 100644
index 0000000..072aca3
--- /dev/null
+++ b/module_bootloader/Makefile
@@ -0,0 +1,9 @@
+# Makefile
+
+#Some definitions
+SRC_DIR = src
+BUILD_DIR = build
+
+
+all: 
+	grub-mkrescue -o $(BUILD_DIR)/uOS.iso $(SRC_DIR)
diff --git a/module_bootloader/src/boot/grub/grub.cfg b/module_bootloader/src/boot/grub/grub.cfg
new file mode 100644
index 0000000..e1dac93
--- /dev/null
+++ b/module_bootloader/src/boot/grub/grub.cfg
@@ -0,0 +1,3 @@
+menuentry "Untitled_Kernel" {
+    multiboot /boot/ukern.elf
+}