diff --git a/src/kernel/core/Jamfile b/src/kernel/core/Jamfile
index c3b0755710..833cd24407 100644
--- a/src/kernel/core/Jamfile
+++ b/src/kernel/core/Jamfile
@@ -8,7 +8,6 @@ KernelMergeObject kernel_core.o :
 	<$(SOURCE_GRIST)>driver_settings.c
 	<$(SOURCE_GRIST)>elf.c 
 	<$(SOURCE_GRIST)>faults.c
-	<$(SOURCE_GRIST)>fd.c
 	<$(SOURCE_GRIST)>gdb.c 
 	<$(SOURCE_GRIST)>heap.c 
 	<$(SOURCE_GRIST)>image.c 
diff --git a/src/kernel/core/fs/Jamfile b/src/kernel/core/fs/Jamfile
index 433b0b002a..45ce5a8751 100644
--- a/src/kernel/core/fs/Jamfile
+++ b/src/kernel/core/fs/Jamfile
@@ -7,6 +7,7 @@ KernelMergeObject kernel_fs.o :
 	<$(SOURCE_GRIST)>bootfs.c
 	<$(SOURCE_GRIST)>devfs.c
 	<$(SOURCE_GRIST)>rootfs.c
+	<$(SOURCE_GRIST)>fd.c
 	<$(SOURCE_GRIST)>vfs.c
 	<$(SOURCE_GRIST)>vfs_select.c
 	<$(SOURCE_GRIST)>message.c
diff --git a/src/kernel/core/fd.c b/src/kernel/core/fs/fd.c
similarity index 100%
rename from src/kernel/core/fd.c
rename to src/kernel/core/fs/fd.c