diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6588d522f3b6..085774ac2064 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5400,6 +5400,12 @@
     githubId = 64467514;
     name = "Daniel Krywult";
   };
+  danilobuerger = {
+    email = "info@danilobuerger.de";
+    github = "danilobuerger";
+    githubId = 996231;
+    name = "Danilo Bürger";
+  };
   daniyalsuri6 = {
     email = "daniyal.suri@gmail.com";
     github = "daniyalsuri6";
diff --git a/pkgs/by-name/bu/buffrs/package.nix b/pkgs/by-name/bu/buffrs/package.nix
new file mode 100644
index 000000000000..0b17c5e9d2cd
--- /dev/null
+++ b/pkgs/by-name/bu/buffrs/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "buffrs";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "helsing-ai";
+    repo = "buffrs";
+    tag = "v${version}";
+    hash = "sha256-c9GjSqVp2wEFgoy8j+Gy5FA3SG4JYEfeSwPWjW81w3Y=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-E7kskULt2eOY+mZjh6jAftj8ciExUF7d1z1pePTBzvQ=";
+
+  # Disabling tests meant to work over the network, as they will fail
+  # inside the builder.
+  checkFlags = [
+    "--skip=cmd::install::upgrade::fixture"
+    "--skip=cmd::publish::lib::fixture"
+    "--skip=cmd::publish::local::fixture"
+    "--skip=cmd::tuto::fixture"
+  ];
+
+  meta = {
+    description = "Modern protobuf package management";
+    homepage = "https://github.com/helsing-ai/buffrs";
+    license = lib.licenses.asl20;
+    mainProgram = "buffrs";
+    maintainers = with lib.maintainers; [ danilobuerger ];
+  };
+}