diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index a82932ce66262d..f41ec127009cae 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -6,6 +6,8 @@
 
 - The default PHP version has been updated to 8.3.
 
+- `bcachefs` is now enabled in the installation media with a suitable kernel.
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## New Modules {#sec-release-25.05-new-modules}
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 943f9d8e31066a..decaefbea87f61 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -45,6 +45,10 @@
   # Include support for various filesystems and tools to create / manipulate them.
   boot.supportedFilesystems =
     [ "btrfs" "cifs" "f2fs" "ntfs" "vfat" "xfs" ] ++
+    # FIXME: Change the test condition to
+    # config.boot.kernelPackages.kernel.kernelAtLeast "6.7"
+    # when bcachefs module no longer defaults to latest kernel
+    lib.optional (config.boot.kernelPackages == pkgs.linuxPackages_latest) "bcachefs" ++
     lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";
 
   # Configure host id for ZFS to work