diff --git a/src/add-ons/Jamfile b/src/add-ons/Jamfile
index 0ad14c040c..82c1f6bf7a 100644
--- a/src/add-ons/Jamfile
+++ b/src/add-ons/Jamfile
@@ -56,33 +56,6 @@ KernelLd
 	drivers/dev/random
 	; 
 
-KernelLd
-	ps2mouse
-	:
-	<$(SOURCE_GRIST)!kernel!drivers!arch!$(OBOS_ARCH)!ps2mouse>ps2mouse.o
-	kernel.so
-	:
-	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
-	:
-	-Bdynamic -shared
-	:
-	:
-	drivers/dev/ps2mouse
-	; 
-
-KernelLd
-	keyboard
-	:
-	<$(SOURCE_GRIST)!kernel!drivers!arch!$(OBOS_ARCH)!keyboard>keyboard.o
-	kernel.so
-	:
-	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
-	:
-	-Bdynamic -shared
-	:
-	:
-	drivers/dev/keyboard
-	; 
 
 # This needs to be fixed once the various headers are fixed.
 #KernelLd 
diff --git a/src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile b/src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile
index 356f68d566..fe58a86c02 100644
--- a/src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile
+++ b/src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile
@@ -1,3 +1,20 @@
 SubDir OBOS_TOP src add-ons kernel drivers arch x86 keyboard ;
 
-KernelObjects keyboard.c : -fno-pic -D_KERNEL_MODE ;
+KernelObjects
+	keyboard.c
+	:
+	-fno-pic -D_KERNEL_MODE
+	;
+
+KernelLd keyboard :
+	<$(SOURCE_GRIST)>keyboard.o
+	kernel.so
+	:
+	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+	:
+	-Bdynamic -shared
+	:
+	:
+	drivers/dev/keyboard
+	; 
+
diff --git a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/Jamfile b/src/add-ons/kernel/drivers/arch/x86/ps2mouse/Jamfile
index 8e6978cc10..086a80290a 100644
--- a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/Jamfile
+++ b/src/add-ons/kernel/drivers/arch/x86/ps2mouse/Jamfile
@@ -1,3 +1,19 @@
 SubDir OBOS_TOP src add-ons kernel drivers arch x86 ps2mouse ;
 
-KernelObjects ps2mouse.c : -fno-pic -D_KERNEL_MODE -D_PS2MOUSE_ ;
+KernelObjects
+	ps2mouse.c
+	:
+	-fno-pic -D_KERNEL_MODE -D_PS2MOUSE_
+	;
+
+KernelLd ps2mouse :
+	<$(SOURCE_GRIST)>ps2mouse.o
+	kernel.so
+	:
+	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+	:
+	-Bdynamic -shared
+	:
+	:
+	drivers/dev/ps2mouse
+	;