diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/by-name/mb/mbuffer/package.nix
similarity index 55%
rename from pkgs/tools/misc/mbuffer/default.nix
rename to pkgs/by-name/mb/mbuffer/package.nix
index 28cd8d7ba995..c86ac98fd4b1 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/by-name/mb/mbuffer/package.nix
@@ -5,13 +5,14 @@
 , which
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mbuffer";
-  version = "20240929";
+  version = "20241007";
+  outputs = [ "out" "man" ];
 
   src = fetchurl {
-    url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
-    sha256 = "sha256-77bG3j4kWdI5h3TN1E7Apua4jEEy7eQ9PV4vbBjZpqc=";
+    url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${finalAttrs.version}.tgz";
+    sha256 = "sha256-nXNjAQtO9FsWRva19QJ7SbtqIJxQL7hOKBx713HVa+0=";
   };
 
   buildInputs = [
@@ -23,12 +24,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description  = "Tool for buffering data streams with a large set of unique features";
     homepage = "https://www.maier-komor.de/mbuffer.html";
-    license = licenses.gpl3Only;
-    maintainers = [ ];
-    platforms = platforms.linux; # Maybe other non-darwin Unix
+    license = lib.licenses.gpl3Only;
+    maintainers = with  lib.maintainers; [ ehmry ];
+    platforms = lib.platforms.linux; # Maybe other non-darwin Unix
     mainProgram = "mbuffer";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 610ab06de46d..926c9e76ecc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9886,8 +9886,6 @@ with pkgs;
 
   mb2md = callPackage ../tools/text/mb2md { };
 
-  mbuffer = callPackage ../tools/misc/mbuffer { };
-
   mecab =
     let
       mecab-nodic = callPackage ../tools/text/mecab/nodic.nix { };