diff --git a/src/add-ons/kernel/file_systems/bfs/Jamfile b/src/add-ons/kernel/file_systems/bfs/Jamfile
index d080267dfc..3d244bcef5 100644
--- a/src/add-ons/kernel/file_systems/bfs/Jamfile
+++ b/src/add-ons/kernel/file_systems/bfs/Jamfile
@@ -6,6 +6,10 @@ SubDir OBOS_TOP src add-ons kernel file_systems bfs ;
 		KEEP_WRONG_DIRENT_RECLEN
 		;
 
+	if $(COMPILE_FOR_R5) {
+		defines += COMPILE_FOR_R5 ;
+	}
+
 	if $(DEBUG) {
 		defines += DEBUG ;
 	} else {
diff --git a/src/add-ons/kernel/file_systems/bfs/fsproto.h b/src/add-ons/kernel/file_systems/bfs/fsproto.h
index d6588a3d25..9daf6ff0c5 100644
--- a/src/add-ons/kernel/file_systems/bfs/fsproto.h
+++ b/src/add-ons/kernel/file_systems/bfs/fsproto.h
@@ -60,7 +60,7 @@ typedef ino_t		vnode_id;
 // B_CUR_FS_API_VERSION is 2 for R5, but 3 on Dano, because of the
 // added calls for power management - so it's set to 3 here because
 // that's a requirement to let Dano boot from our fs...
-#ifdef B_BEOS_VERSION_DANO
+#if defined(B_BEOS_VERSION_DANO) && !defined(COMPILE_FOR_R5)
 #	define B_CUR_FS_API_VERSION	3
 #else
 #	define B_CUR_FS_API_VERSION 2
diff --git a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
index a977939ebb..eed4c76551 100644
--- a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
@@ -213,8 +213,13 @@ vnode_ops fs_entry =  {
 };
 
 #define BFS_IO_SIZE	65536
-#define BFS_NAME	"obfs"
-	// ToDo: has to change to "bfs" later
+
+// ToDo: has to change to "bfs" later
+#ifdef COMPILE_FOR_R5
+#	define BFS_NAME	"bfs"
+#else
+#	define BFS_NAME "obfs"
+#endif
 
 int32	api_version = B_CUR_FS_API_VERSION;