diff --git a/src/tools/copy_to_bfs_image/Jamfile b/src/tools/copy_to_bfs_image/Jamfile
index da65cc6806..b6f32b81aa 100644
--- a/src/tools/copy_to_bfs_image/Jamfile
+++ b/src/tools/copy_to_bfs_image/Jamfile
@@ -14,7 +14,7 @@ UsePrivateHeaders [ FDirName kernel ] ;			# For kernel_cpp.cpp
 		malloc_debug_flags = -fcheck-memory-usage ;
 	}
 
-	local defines = [ FDefines USER
+	local defines = [ FDefines USER #DEBUG
 		NO_FILE_UNCACHED_IO
 		UNSAFE_GET_VNODE
 		#BFS_BIG_ENDIAN_ONLY
@@ -30,9 +30,9 @@ BinCommand copy_to_bfs_image :
 	sysdep.c hexdump.c argv.c
 
 	Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp
-	BlockAllocator.cpp kernel_interface.cpp Utility.cpp BufferPool.cpp
+	BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp
 	Debug.cpp kernel_cpp.cpp
-	
+
 	strlcat.c
 	:
 	;
@@ -40,7 +40,7 @@ BinCommand copy_to_bfs_image :
 # Tell Jam where to find these sources
 SEARCH on [ FGristFiles
 		Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp
-		BlockAllocator.cpp kernel_interface.cpp Utility.cpp BufferPool.cpp
+		BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp
 		Debug.cpp
 	] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems bfs ] ;