diff --git a/pkgs/tools/package-management/koji/default.nix b/pkgs/development/python-modules/koji/default.nix
similarity index 72%
rename from pkgs/tools/package-management/koji/default.nix
rename to pkgs/development/python-modules/koji/default.nix
index 7d2022ee91b..262ea74d4a3 100644
--- a/pkgs/tools/package-management/koji/default.nix
+++ b/pkgs/development/python-modules/koji/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, fetchurl, python2 }:
+{ stdenv, fetchurl, mkPythonDerivation, pycurl }:
 
-let
-  pythonEnv = python2.withPackages(ps : [ps.pycurl]);
-in stdenv.mkDerivation rec {
+mkPythonDerivation rec {
   name = "koji-1.8";
 
   src = fetchurl {
@@ -10,11 +8,12 @@ in stdenv.mkDerivation rec {
     sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1";
   };
 
-  propagatedBuildInputs = [ pythonEnv ];
+  propagatedBuildInputs = [ pycurl ];
 
   makeFlags = "DESTDIR=$(out)";
 
   postInstall = ''
+    mv $out/usr/* $out/
     cp -R $out/nix/store/*/* $out/
     rm -rf $out/nix
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cad0b6c8031..69790130efc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13575,8 +13575,6 @@ in
     stdenv = overrideCC stdenv gcc49;
   };
 
-  koji = callPackage ../tools/package-management/koji { };
-
   konversation = qt5.callPackage ../applications/networking/irc/konversation/1.6.nix { };
 
   krita = qt5.callPackage ../applications/graphics/krita {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd6e74c6a64..8eaa75fb69d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13338,7 +13338,9 @@ in {
       homepage    = "https://github.com/twisted/klein";
       license     = licenses.mit;
     };
-   };
+  };
+
+  koji = callPackage ../development/python-modules/koji { };
 
   kombu = buildPythonPackage rec {
     name = "kombu-${version}";