diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix
index ae5c3e0ab1af..b832b7051e3c 100644
--- a/pkgs/development/python-modules/psd-tools/default.nix
+++ b/pkgs/development/python-modules/psd-tools/default.nix
@@ -1,27 +1,46 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
 , docopt
 , pillow
 , enum34
+, scikitimage
+, aggdraw
+, pytestCheckHook
+, ipython
+, cython
 }:
 
 buildPythonPackage rec {
   pname = "psd-tools";
   version = "1.9.21";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-BlfJnC03W0BEOr2Nav0Tj0fzjwAVlTPjyN0KmxxQMVI=";
+  src = fetchFromGitHub {
+    owner = "psd-tools";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-+nqN7DJHbr7XkfG0oUQkWcxv+krR8DlQndAQCvnBk3s=";
   };
 
+  nativeBuildInputs = [ cython ];
+
   propagatedBuildInputs = [
+    aggdraw
     docopt
+    ipython
     pillow
-  ] ++ lib.optionals isPy27 [ enum34 ];
+    scikitimage
+  ];
 
-  meta = {
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "psd_tools" ];
+
+  meta = with lib; {
     description = "Python package for reading Adobe Photoshop PSD files";
     homepage = "https://github.com/kmike/psd-tools";
-    license = lib.licenses.mit;
-    broken = true; # missing packbits from nixpkgs
+    license = licenses.mit;
+    maintainers = with maintainers; [ onny ];
   };
 }