diff --git a/pkgs/development/python-modules/fedpkg/default.nix b/pkgs/development/python-modules/fedpkg/default.nix
new file mode 100644
index 00000000000..c3aeed0abbe
--- /dev/null
+++ b/pkgs/development/python-modules/fedpkg/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
+
+buildPythonPackage rec {
+  pname = "fedpkg";
+  version = "1.29";
+  name  = "${pname}-${version}";
+
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "https://releases.pagure.org/fedpkg/${name}.tar.bz2";
+    sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
+  };
+
+  #patches = [ ../development/python-modules/fedpkg-buildfix.diff ];
+  propagatedBuildInputs = [ rpkg offtrac urlgrabber ];
+
+  doCheck = false; # requires fedora_cert which isn't used anymore
+
+  meta = with stdenv.lib; {
+    description = "Subclass of the rpkg project for dealing with rpm packaging";
+    homepage = https://pagure.io/fedpkg;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ mornfall ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a4ad64d02f8..825f496e4cb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5560,18 +5560,7 @@ in {
     buildInputs = with self; [ fudge_9 nose ];
   };
 
-  fedpkg = buildPythonPackage (rec {
-    name = "fedpkg-1.14";
-    meta.maintainers = with maintainers; [ mornfall ];
-
-    src = pkgs.fetchurl {
-      url = "https://fedorahosted.org/releases/f/e/fedpkg/${name}.tar.bz2";
-      sha256 = "0rj60525f2sv34g5llafnkmpvbwrfbmfajxjc14ldwzymp8clc02";
-    };
-
-    patches = [ ../development/python-modules/fedpkg-buildfix.diff ];
-    propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ];
-  });
+  fedpkg = callPackage ../development/python-modules/fedpkg { };
 
   flit = callPackage ../development/python-modules/flit { };