diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fba18ac75a72..8d2a07bd58c0 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -478,6 +478,7 @@
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
   taeer = "Taeer Bar-Yam <taeer@necsi.edu>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
+  takikawa = "Asumu Takikawa <asumu@igalia.com>";
   taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
   tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
   teh = "Tom Hunger <tehunger@gmail.com>";
diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix
new file mode 100644
index 000000000000..f1232d7d253a
--- /dev/null
+++ b/pkgs/development/libraries/ndpi/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }:
+
+let version = "1.8"; in
+
+stdenv.mkDerivation rec {
+  name = "ndpi-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ntop";
+    repo = "nDPI";
+    rev = "${version}";
+    sha256 = "0kxp9dv4d1nmr2cxv6zsfy2j14wyb0q6am0qyxg0npjb08p7njf4";
+  };
+
+  configureScript = "./autogen.sh";
+
+  nativeBuildInputs = [which autoconf automake libtool];
+  buildInputs = [libpcap];
+
+  meta = with stdenv.lib; {
+    description = "A library for deep-packet inspection";
+    longDescription = ''
+      nDPI is a library for deep-packet inspection based on OpenDPI.
+    '';
+    homepage = http://www.ntop.org/products/deep-packet-inspection/ndpi/;
+    license = with licenses; lgpl3;
+    maintainers = with maintainers; [ takikawa ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efe49567ea3a..fb3e0fd34606 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8935,6 +8935,8 @@ with pkgs;
 
   nanomsg = callPackage ../development/libraries/nanomsg { };
 
+  ndpi = callPackage ../development/libraries/ndpi { };
+
   notify-sharp = callPackage ../development/libraries/notify-sharp { };
 
   ncurses5 = callPackage ../development/libraries/ncurses { abiVersion = "5"; };