diff --git a/kernel/filesystem/Makefile b/kernel/filesystem/Makefile
index c3287936..951b39c3 100644
--- a/kernel/filesystem/Makefile
+++ b/kernel/filesystem/Makefile
@@ -1,20 +1,20 @@
 
 CFLAGS += -I .
 
-all: fat32.o MBR.o VFS.o fat_ent.o
+
+kernel_fs_objs:= $(shell find ./*.c)
+kernel_fs_subdirs:= devfs VFS fat32
+
+ECHO:
+	@echo "$@"
 
 
-fat32.o: fat32/fat32.c
-	gcc $(CFLAGS) -c fat32/fat32.c -o fat32/fat32.o
+$(kernel_fs_objs): ECHO
+	gcc $(CFLAGS) -c $@ -o $@.o
 
-MBR.o: MBR.c
-	gcc $(CFLAGS) -c MBR.c -o MBR.o
+$(kernel_fs_subdirs): ECHO
+	$(MAKE) -C $@ all CFLAGS="$(CFLAGS)" ASFLAGS="$(ASFLAGS)" PIC="$(PIC)"
 
-VFS.o: VFS/VFS.c
-	gcc $(CFLAGS) -c VFS/VFS.c -o VFS/VFS.o
 
-fat_ent.o: fat32/fat_ent.c
-	gcc $(CFLAGS) -c fat32/fat_ent.c -o fat32/fat_ent.o
+all: $(kernel_fs_objs) $(kernel_fs_subdirs)
 
-clean:
-	echo "Done."
\ No newline at end of file
diff --git a/kernel/filesystem/VFS/Makefile b/kernel/filesystem/VFS/Makefile
new file mode 100644
index 00000000..5b016cf9
--- /dev/null
+++ b/kernel/filesystem/VFS/Makefile
@@ -0,0 +1,17 @@
+
+CFLAGS += -I .
+
+
+kernel_fs_vfs_objs:= $(shell find ./*.c)
+
+
+ECHO:
+	@echo "$@"
+
+
+$(kernel_fs_vfs_objs): ECHO
+	gcc $(CFLAGS) -c $@ -o $@.o
+
+
+all: $(kernel_fs_vfs_objs)
+
diff --git a/kernel/filesystem/devfs/Makefile b/kernel/filesystem/devfs/Makefile
new file mode 100644
index 00000000..75a79c41
--- /dev/null
+++ b/kernel/filesystem/devfs/Makefile
@@ -0,0 +1,17 @@
+
+CFLAGS += -I .
+
+
+kernel_fs_devfs_objs:= $(shell find ./*.c)
+
+
+ECHO:
+	@echo "$@"
+
+
+$(kernel_fs_devfs_objs): ECHO
+	gcc $(CFLAGS) -c $@ -o $@.o
+
+
+all: $(kernel_fs_devfs_objs)
+
diff --git a/kernel/filesystem/fat32/Makefile b/kernel/filesystem/fat32/Makefile
new file mode 100644
index 00000000..d4926865
--- /dev/null
+++ b/kernel/filesystem/fat32/Makefile
@@ -0,0 +1,17 @@
+
+CFLAGS += -I .
+
+
+kernel_fs_fat32_objs:= $(shell find ./*.c)
+
+
+ECHO:
+	@echo "$@"
+
+
+$(kernel_fs_fat32_objs): ECHO
+	gcc $(CFLAGS) -c $@ -o $@.o
+
+
+all: $(kernel_fs_fat32_objs)
+