diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 93bd8098f45..f1dce94bf8c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -165,6 +165,7 @@
   lebastr = "Alexander Lebedev <lebastr@gmail.com>";
   leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
+  lewo = "Antoine Eiche <lewo@abesis.fr>";
   lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
   lihop = "Leroy Hopson <nixos@leroy.geek.nz>";
   linquize = "Linquize <linquize@yahoo.com.hk>";
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
new file mode 100644
index 00000000000..5db62da06d8
--- /dev/null
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pythonPackages, python} :
+
+pythonPackages.buildPythonPackage rec {
+  name = "devpi-client-${version}";
+  version = "2.3.2";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/d/devpi-client/devpi-client-${version}.tar.gz";
+    md5= "bfc8cd768f983fd0585c347bca00c8bb";
+  };
+
+  buildInputs = [ pythonPackages.tox pythonPackages.check-manifest pythonPackages.devpi-common pythonPackages.pkginfo ];
+  meta = {
+    homepage = http://doc.devpi.net;
+    description = "Github-style pypi index server and packaging meta tool";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [stdenv.lib.maintainers.lewo];
+
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86ab05ae852..44b92c77c9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3832,6 +3832,8 @@ let
   cython = pythonPackages.cython;
   cython3 = python3Packages.cython;
 
+  devpi-client = callPackage ../development/tools/devpi-client {};
+
   ecl = callPackage ../development/compilers/ecl { };
 
   eql = callPackage ../development/compilers/eql {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f800fd0839f..135e5b06cb3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2208,6 +2208,44 @@ in modules // {
   buildout = self.zc_buildout;
   buildout152 = self.zc_buildout152;
 
+  check-manifest = buildPythonPackage rec {
+    name = "check-manifest";
+    version = "0.30";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/c/check-manifest/check-manifest-${version}.tar.gz";
+      md5 = "b18f7f0bcd02f52d40148c388ace9290";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = https://github.com/mgedmin/check-manifest;
+      description = "Check MANIFEST.in in a Python source package for completeness";
+      license = licenses.mit;
+      maintainers = with maintainers; [ lewo ];
+    };
+  };
+
+  devpi-common = buildPythonPackage rec {
+    name = "devpi-common";
+    version = "2.0.8";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/devpi-common/devpi-common-${version}.tar.gz";
+      md5 = "3739af0f59151d1aaa67035fec8f97c6";
+    };
+
+    propagatedBuildInputs = [ self.requests2 self.py ];
+
+    meta = {
+      homepage = https://bitbucket.org/hpk42/devpi;
+      description = "Utilities jointly used by devpi-server and devpi-client";
+      license = licenses.mit;
+      maintainers = with maintainers; [ lewo ];
+    };
+  };
+
   # A patched version of buildout, useful for buildout based development on Nix
   zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { };