diff --git a/src/add-ons/kernel/file_systems/bfs/Jamfile b/src/add-ons/kernel/file_systems/bfs/Jamfile
index c5ba5ca06b..17c3a87ea8 100644
--- a/src/add-ons/kernel/file_systems/bfs/Jamfile
+++ b/src/add-ons/kernel/file_systems/bfs/Jamfile
@@ -21,6 +21,9 @@ oldOPTIM = $(OPTIM) ;
 	# report itself as "bfs" instead of "obfs"
 	if $(BFS_REPLACEMENT) {
 		defines += BFS_REPLACEMENT ;
+		bfsAddOnName = bfs ;
+	} else {
+		bfsAddOnName = obfs ;
 	}	
 
 	if $(DEBUG) = 0 {
@@ -35,7 +38,7 @@ oldOPTIM = $(OPTIM) ;
 
 UsePrivateHeaders [ FDirName kernel util ] ;			# For kernel_cpp.cpp
 
-R5KernelAddon obfs : [ FDirName kernel file_systems bfs ] :
+R5KernelAddon $(bfsAddOnName) : [ FDirName kernel file_systems ] :
 	BlockAllocator.cpp
 	BPlusTree.cpp
 	kernel_cpp.cpp