diff --git a/src/tools/bfs_shell/Jamfile b/src/tools/bfs_shell/Jamfile
index 5f79a4ee31..67cb11ed32 100644
--- a/src/tools/bfs_shell/Jamfile
+++ b/src/tools/bfs_shell/Jamfile
@@ -18,8 +18,15 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
 	}
 
 	defines = [ FDefines $(defines) ] ;
+
+	local c++flags = ;
+	if $(HOST_GCC_VERSION[1]) >= 3 {
+		c++flags += -std=c++11 ;
+	}
+
 	SubDirCcFlags $(defines) -Wno-multichar ;
 	SubDirC++Flags $(defines) -Wno-multichar -fno-rtti ;
+	SubDirC++Flags $(defines) $(c++flags) -Wno-multichar -fno-rtti ;
 }
 
 # platform specific libraries