diff --git a/default.nix b/default.nix
index 2ec58d1..021f500 100644
--- a/default.nix
+++ b/default.nix
@@ -71,6 +71,7 @@ in
       wordpress-plugins
       wordpress-themes
       kubo
+      linux-bcachefs
       ;
   }
   // (
diff --git a/flake.nix b/flake.nix
index 0feb56b..a63cf12 100644
--- a/flake.nix
+++ b/flake.nix
@@ -114,6 +114,7 @@
               wordpress-plugins
               wordpress-themes
               kubo
+              linux-bcachefs
               ;
           }
           // (
diff --git a/linux/bcachefs/default.nix b/linux/bcachefs/default.nix
new file mode 100644
index 0000000..fe48165
--- /dev/null
+++ b/linux/bcachefs/default.nix
@@ -0,0 +1,32 @@
+{ lib,
+  fetchFromGitHub,
+  buildLinux,
+  ...
+} @ args:
+
+let 
+    modDirVersion = "6.3.0";
+    source = builtins.fromJSON (builtins.readFile ./source.json);
+in buildLinux (args // {
+    inherit modDirVersion;
+    version = source.date;
+    src = fetchFromGitHub {
+        owner = "koverstreet";
+        repo = "bcachefs";
+        inherit (source) rev sha256;
+    };
+    structuredExtraConfig = with lib.kernel; {
+        BCACHEFS_FS = module;
+        BCACHEFS_DEBUG = yes;
+        KALLSYMS = yes;
+        KALLSYMS_ALL = yes;
+        DEBUG_FS = yes;
+        DYNAMIC_FTRACE = yes;
+        FTRACE = yes;
+    };
+    passthru.updateScript = [
+        ../../scripts/update-git.sh
+        "github.com/koverstreet/bcachefs"
+        "linux/bcachefs/source.json"
+    ];
+})
diff --git a/linux/bcachefs/source.json b/linux/bcachefs/source.json
new file mode 100644
index 0000000..4a79569
--- /dev/null
+++ b/linux/bcachefs/source.json
@@ -0,0 +1,11 @@
+{
+  "url": "https://github.com/koverstreet/bcachefs",
+  "rev": "799716df00709f7480f575e8fd626915bafba006",
+  "date": "2023-05-14T23:01:14-04:00",
+  "path": "/nix/store/mx6zdja6ii9g3pd7vzv9k4rnm4p4spqm-bcachefs",
+  "sha256": "0zid3g15034nd5cwmn233kn6fjyphkax2nklzhb46sz2283gzkiv",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/overlay.nix b/overlay.nix
index b0e6746..38cd697 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -85,6 +85,7 @@ system: self: super: let
       wordpress-plugins = self.callPackage ./web/wordpress-plugins {};
       wordpress-themes = self.callPackage ./web/wordpress-themes {};
       kubo = self.callPackage ./ipfs/kubo {};
+      linux-bcachefs = self.callPackage ./linux/bcachefs { kernelPatches = []; };
     })
     riscv-overlay
   ];