diff --git a/src/system/libroot/os/arch/generic/stack_trace.cpp b/src/system/libroot/os/arch/generic/generic_stack_trace.cpp
similarity index 100%
rename from src/system/libroot/os/arch/generic/stack_trace.cpp
rename to src/system/libroot/os/arch/generic/generic_stack_trace.cpp
diff --git a/src/system/libroot/os/arch/ppc/Jamfile b/src/system/libroot/os/arch/ppc/Jamfile
index 88711765a2..b140363c1f 100644
--- a/src/system/libroot/os/arch/ppc/Jamfile
+++ b/src/system/libroot/os/arch/ppc/Jamfile
@@ -25,8 +25,9 @@ for architectureObject in [ MultiArchSubDirSetup ppc ] {
 			time.c
 			tls.c
 
+			# sources from generic
 			generic_system_time_nsecs.cpp
-			stack_trace.cpp
+			generic_stack_trace.cpp
 			;
 	}
 }
diff --git a/src/system/libroot/os/arch/sparc/Jamfile b/src/system/libroot/os/arch/sparc/Jamfile
index 65fadaea06..0a58394b68 100644
--- a/src/system/libroot/os/arch/sparc/Jamfile
+++ b/src/system/libroot/os/arch/sparc/Jamfile
@@ -25,9 +25,10 @@ for architectureObject in [ MultiArchSubDirSetup sparc ] {
 			fpu_add.c fpu_compare.c fpu_div.c fpu_explode.c fpu_implode.c
 			fpu_mul.c fpu_reg.S fpu_sqrt.c fpu_subr.c
 
+			# sources from generic
 			generic_atomic.cpp
 			generic_system_time_nsecs.cpp
-			stack_trace.cpp
+			generic_stack_trace.cpp
 			;
 	}
 }
diff --git a/src/system/libroot/os/arch/x86/Jamfile b/src/system/libroot/os/arch/x86/Jamfile
index 8fda6b8ff5..50e421b7cc 100644
--- a/src/system/libroot/os/arch/x86/Jamfile
+++ b/src/system/libroot/os/arch/x86/Jamfile
@@ -10,6 +10,8 @@ for architectureObject in [ MultiArchSubDirSetup x86 x86_gcc2 ] {
 			# TODO in time.c!
 		UsePrivateSystemHeaders ;
 
+		SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
+
 		local compatibilitySources ;
 		if $(TARGET_GCC_VERSION_$(architecture)[1]) = 2 {
 			compatibilitySources =
@@ -29,7 +31,8 @@ for architectureObject in [ MultiArchSubDirSetup x86 x86_gcc2 ] {
 
 			$(compatibilitySources)
 
-			stack_trace.cpp
+			# sources from generic
+			generic_stack_trace.cpp
 			;
 	}
 }
diff --git a/src/system/libroot/os/arch/x86_64/Jamfile b/src/system/libroot/os/arch/x86_64/Jamfile
index e4670b3638..43093bb5dd 100644
--- a/src/system/libroot/os/arch/x86_64/Jamfile
+++ b/src/system/libroot/os/arch/x86_64/Jamfile
@@ -10,9 +10,7 @@ for architectureObject in [ MultiArchSubDirSetup x86_64 ] {
 			# TODO in time.c!
 		UsePrivateSystemHeaders ;
 
-		SEARCH_SOURCE +=
-			[ FDirName $(SUBDIR) $(DOTDOT) generic ]
-			;
+		SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
 
 		MergeObject <$(architecture)>os_arch_$(TARGET_ARCH).o :
 			byteorder.S
@@ -25,7 +23,7 @@ for architectureObject in [ MultiArchSubDirSetup x86_64 ] {
 
 			# sources from generic
 			generic_atomic.cpp
-			stack_trace.cpp
+			generic_stack_trace.cpp
 			;
 	}
 }