diff --git a/pkgs/development/python-modules/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix
similarity index 84%
rename from pkgs/development/python-modules/fedpkg/default.nix
rename to pkgs/development/tools/fedpkg/default.nix
index e23a3e4a0d6..7c82dc9d32a 100644
--- a/pkgs/development/python-modules/fedpkg/default.nix
+++ b/pkgs/development/tools/fedpkg/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
+{ stdenv, buildPythonApplication, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   pname = "fedpkg";
   version = "1.29";
 
diff --git a/pkgs/development/python-modules/fedpkg/fix-paths.patch b/pkgs/development/tools/fedpkg/fix-paths.patch
similarity index 100%
rename from pkgs/development/python-modules/fedpkg/fix-paths.patch
rename to pkgs/development/tools/fedpkg/fix-paths.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e21ab50f0dd..7f0811fd408 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8533,6 +8533,8 @@ with pkgs;
 
   jdepend = callPackage ../development/tools/analysis/jdepend { };
 
+  fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { };
+
   flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
   flex = callPackage ../development/tools/parsing/flex { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be0cfdb6ce3..2c1c772a7a2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1655,8 +1655,6 @@ in {
     then callPackage ../development/python-modules/faulthandler {}
     else throw "faulthandler is built into ${python.executable}";
 
-  fedpkg = callPackage ../development/python-modules/fedpkg { };
-
   flit = callPackage ../development/python-modules/flit { };
 
   flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { };