diff --git a/src/add-ons/Jamfile b/src/add-ons/Jamfile
index 82c1f6bf7a..552bae4cb5 100644
--- a/src/add-ons/Jamfile
+++ b/src/add-ons/Jamfile
@@ -6,7 +6,7 @@ KernelLd
 	<$(SOURCE_GRIST)!kernel!drivers!common>zero.o
 	kernel.so
 	:
-	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
 	:
 	-Bdynamic -shared
 	:
@@ -20,7 +20,7 @@ KernelLd
 	<$(SOURCE_GRIST)!kernel!drivers!common>null.o
 	kernel.so
 	:
-	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
 	:
 	-Bdynamic -shared
 	:
@@ -34,7 +34,7 @@ KernelLd
 #	<$(SOURCE_GRIST)!kernel!drivers!common>digit.o
 #	kernel.so
 #	:
-#	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+#	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
 #	:
 #	-Bdynamic -shared
 #	:
@@ -48,7 +48,7 @@ KernelLd
 	<$(SOURCE_GRIST)!kernel!drivers!random>driver.o
 	kernel.so
 	:
-	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
 	:
 	-Bdynamic -shared
 	:
@@ -69,7 +69,7 @@ KernelLd
 #	<$(SOURCE_GRIST)!kernel!drivers!audio!ac97!ich>util.o   
 #	kernel.so
 #	:
-#	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+#	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
 #	:
 #	-Bdynamic -shared
 #	:
diff --git a/src/add-ons/kernel/bus_managers/Jamfile b/src/add-ons/kernel/bus_managers/Jamfile
index e829582929..f18885072f 100644
--- a/src/add-ons/kernel/bus_managers/Jamfile
+++ b/src/add-ons/kernel/bus_managers/Jamfile
@@ -12,7 +12,7 @@ KernelLd
 	<$(SOURCE_GRIST)>config_manager.o
 	kernel.so
 	:
-	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
 	:
 	-Bdynamic -shared
 	:
diff --git a/src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile b/src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile
index fe58a86c02..cf09b09a86 100644
--- a/src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile
+++ b/src/add-ons/kernel/drivers/arch/x86/keyboard/Jamfile
@@ -10,7 +10,7 @@ KernelLd keyboard :
 	<$(SOURCE_GRIST)>keyboard.o
 	kernel.so
 	:
-	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
 	:
 	-Bdynamic -shared
 	:
diff --git a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/Jamfile b/src/add-ons/kernel/drivers/arch/x86/ps2mouse/Jamfile
index 086a80290a..6f63f15a10 100644
--- a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/Jamfile
+++ b/src/add-ons/kernel/drivers/arch/x86/ps2mouse/Jamfile
@@ -10,7 +10,7 @@ KernelLd ps2mouse :
 	<$(SOURCE_GRIST)>ps2mouse.o
 	kernel.so
 	:
-	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
 	:
 	-Bdynamic -shared
 	:
diff --git a/src/kernel/Jamfile b/src/kernel/Jamfile
index 2abf7be1bf..432c03bd9a 100644
--- a/src/kernel/Jamfile
+++ b/src/kernel/Jamfile
@@ -10,7 +10,7 @@ KernelLd stage2 :
 	<$(SOURCE_GRIST)!libroot!posix!string>memcpy.o
 	<$(SOURCE_GRIST)!libroot!posix!string>strnlen.o
 	:
-	$(SUBDIR)/boot/arch/$(OBOS_ARCH)/stage2.ld 
+	$(SUBDIR)/ldscripts/$(OBOS_ARCH)/stage2.ld 
 	:
 	-dN
 	:
@@ -40,7 +40,7 @@ KernelLd kernel :
 	kernel_posix_unistd.o
 	posix_string.o
 	:
-	$(SUBDIR)/core/arch/$(OBOS_ARCH)/kernel.ld 
+	$(SUBDIR)/ldscripts/$(OBOS_ARCH)/kernel.ld 
 	:
 	-Bdynamic -export-dynamic -dynamic-linker /foo/bar
 	:
@@ -72,7 +72,7 @@ KernelLd kernel.so :
 	kernel_posix_unistd.o
 	posix_string.o
 	:
-	$(SUBDIR)/core/arch/$(OBOS_ARCH)/kernel.ld 
+	$(SUBDIR)/ldscripts/$(OBOS_ARCH)/kernel.ld 
 	:
 	-Bdynamic -shared -export-dynamic -dynamic-linker /foo/bar
 	;
diff --git a/src/kernel/core/addons/bus_managers/isa/Jamfile b/src/kernel/core/addons/bus_managers/isa/Jamfile
index f68b3f04bb..8cbd057755 100644
--- a/src/kernel/core/addons/bus_managers/isa/Jamfile
+++ b/src/kernel/core/addons/bus_managers/isa/Jamfile
@@ -7,7 +7,7 @@ KernelLd isa
 	<$(SOURCE_GRIST)>isa.o
 	kernel.so
 	:
-	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
 	:
 	-Bdynamic -shared
 	:
diff --git a/src/kernel/core/addons/bus_managers/pci/Jamfile b/src/kernel/core/addons/bus_managers/pci/Jamfile
index 1a766e0b1b..2ed9582c69 100644
--- a/src/kernel/core/addons/bus_managers/pci/Jamfile
+++ b/src/kernel/core/addons/bus_managers/pci/Jamfile
@@ -9,7 +9,7 @@ KernelLd
 	<$(SOURCE_GRIST)>pci_bus.o
 	kernel.so
 	:
-	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
 	:
 	-Bdynamic -shared
 	: