diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix
new file mode 100644
index 00000000000..d85b0d0dff9
--- /dev/null
+++ b/pkgs/development/libraries/libcli/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "1.9.7";
+  name = "libcli-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/dparrish/libcli/archive/v${version}.tar.gz";
+    sha256 = "0v4867jbach5zd1nq0sspq5q95vvbpnljzm2yf64k8a4w2vadpbx";
+  };
+
+  enableParallelBuilding = true;
+
+  makeFlags = "PREFIX=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "Emulate a Cisco-style telnet command-line interface";
+    homepage = http://sites.dparrish.com/libcli;
+    license = with licenses; lgpl21Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index da32903c94e..f6908cd514c 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0zcwjav1qgr7ikmvfmy7g3nc7s1kj4j4939d18mpyha9mwy4mv6r";
   };
 
-  buildInputs = [ pkgconfig libnfnetlink libmnl ];
+  buildInputs = [ pkgconfig libmnl ];
+  propagatedBuildInputs = [ libnfnetlink ];
 
   meta = {
     description = "Userspace library providing an API to the in-kernel connection tracking state table";
@@ -22,5 +23,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
 
     platforms = stdenv.lib.platforms.linux;
+    maintainers = stdenv.lib.maintainers.nckx;
   };
 }
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 0fa4e2db229..e9a0157b123 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchFromGitHub, bison, flex, geoip, libnet, libnetfilter_conntrack, libnl
-, libpcap, liburcu, ncurses, perl, pkgconfig, which, zlib }:
+{ stdenv, fetchFromGitHub, bison, flex, geoip, libcli, libnet
+, libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
+, pkgconfig, which, zlib }:
 
 stdenv.mkDerivation rec {
   version = "0.5.9-rc4-40-g5107740";
@@ -12,14 +13,14 @@ stdenv.mkDerivation rec {
     sha256 = "1z3b7pa5rhz37dhfb1riy1j9lg917bs4z7clqbxm1hzi1x2ln988";
   };
 
-  # ./configure is not autoGNU but some home-brewn magic
-  preConfigure = "patchShebangs configure";
-  postConfigure = "substituteInPlace Makefile --replace ' tput ' ' true '";
+  buildInputs = [ bison flex geoip libcli libnet libnl libnetfilter_conntrack
+    libpcap libsodium liburcu ncurses perl pkgconfig which zlib ];
 
-  # FIXME: missing nacl/libcli and a *working* libnetfilter_conntrack
-  # The following tools will be missing: curvetun flowtop mausezahn
-  buildInputs = [ bison flex geoip libnet libnl libnetfilter_conntrack
-    libpcap liburcu ncurses perl pkgconfig which zlib ];
+  # ./configure is not autoGNU but some home-brewn magic
+  configurePhase = ''
+    patchShebangs configure
+    NACL_INC_DIR=${libsodium}/include/sodium NACL_LIB=sodium ./configure
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24462e6cb10..cbd81733ee4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5831,6 +5831,8 @@ let
 
   libchop = callPackage ../development/libraries/libchop { };
 
+  libcli = callPackage ../development/libraries/libcli { };
+
   libcm = callPackage ../development/libraries/libcm { };
 
   inherit (gnome3) libcroco;