diff --git a/src/system/kernel/Jamfile b/src/system/kernel/Jamfile
index cc8a13cfc7..b51b335687 100644
--- a/src/system/kernel/Jamfile
+++ b/src/system/kernel/Jamfile
@@ -76,7 +76,7 @@ KernelLd kernel_$(TARGET_ARCH) :
 	kernel_util.o
 	kernel_vm.o
 
-	lib$(TARGET_ARCH).a
+	kernel_arch_$(TARGET_ARCH).o
 	kernel_platform_$(TARGET_BOOT_PLATFORM).o
 
 	linkhack.so
@@ -109,7 +109,7 @@ KernelLd kernel.so :
 	kernel_util.o
 	kernel_vm.o
 
-	lib$(TARGET_ARCH).a
+	kernel_arch_$(TARGET_ARCH).o
 	kernel_platform_$(TARGET_BOOT_PLATFORM).o
 
 	linkhack.so
diff --git a/src/system/kernel/arch/m68k/Jamfile b/src/system/kernel/arch/m68k/Jamfile
index 15f6a62c8b..3ea9241052 100644
--- a/src/system/kernel/arch/m68k/Jamfile
+++ b/src/system/kernel/arch/m68k/Jamfile
@@ -23,7 +23,7 @@ KernelMergeObject arch_m68k_060.o :
 	: $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused -m68060
 ;
 
-KernelStaticLibrary libm68k :
+KernelMergeObject kernel_arch_m68k.o :
 	arch_atomic.c
 	arch_cpu.cpp
 	arch_cpu_asm.S
diff --git a/src/system/kernel/arch/ppc/Jamfile b/src/system/kernel/arch/ppc/Jamfile
index 2a461150c0..4b972da04d 100644
--- a/src/system/kernel/arch/ppc/Jamfile
+++ b/src/system/kernel/arch/ppc/Jamfile
@@ -5,7 +5,7 @@ UsePrivateKernelHeaders ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
 
-KernelStaticLibrary libppc :
+KernelMergeObject kernel_arch_ppc.o :
 	arch_atomic.c
 	arch_cpu.cpp
 	arch_cpu_asm.S
diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile
index 04e80a955c..bc76e30b12 100644
--- a/src/system/kernel/arch/x86/Jamfile
+++ b/src/system/kernel/arch/x86/Jamfile
@@ -9,7 +9,7 @@ UsePrivateKernelHeaders ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
 
-KernelStaticLibrary libx86 :
+KernelMergeObject kernel_arch_x86.o :
 	arch_commpage.cpp
 	arch_cpu.c
 	arch_debug.cpp