diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 443fe780bc0b..20dd2581eb89 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -279,6 +279,7 @@
   theuni = "Christian Theune <ct@flyingcircus.io>";
   thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
   titanous = "Jonathan Rudenberg <jonathan@titanous.com>";
+  tokudan = "Daniel Frank <git@danielfrank.net>";
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
   travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";
   trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";
diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
new file mode 100644
index 000000000000..b75b5dfbebd5
--- /dev/null
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl,
+	openssl,
+ } :
+
+stdenv.mkDerivation rec {
+  version = "20151002";
+  name = "mbuffer-${version}";
+
+  src = fetchurl {
+    url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
+    sha256 = "04pz70jr7fkdyax7b67g9jr0msl6ff2i8s6fl8zginqz5rrxckqk";
+  };
+
+  buildInputs = [ openssl ];
+
+  meta = {
+    homepage = http://www.maier-komor.de/mbuffer.html;
+    description  = "mbuffer is a tool for buffering data streams with a large set of unique features";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ tokudan ];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21a12c81db2a..a613d2ddaed6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2196,6 +2196,8 @@ let
 
   mbox = callPackage ../tools/security/mbox { };
 
+  mbuffer = callPackage ../tools/misc/mbuffer { };
+
   memtest86 = callPackage ../tools/misc/memtest86 { };
 
   memtest86plus = callPackage ../tools/misc/memtest86+ { };