diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index 63bb594cd43..1a854845cc4 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     # Well, parts might be considered unfree, if being strict; see:
     # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright
     license = licenses.bsd3;
-    maintainers = [ maintainers.vcunat ];
+    maintainers = with maintainers; [ vcunat yrashk ];
   };
 }
diff --git a/pkgs/tools/typesetting/xml2rfc/default.nix b/pkgs/tools/typesetting/xml2rfc/default.nix
deleted file mode 100644
index 7fe0396ae44..00000000000
--- a/pkgs/tools/typesetting/xml2rfc/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ python, stdenv }:
-
-with python.pkgs;
-
-buildPythonPackage rec {
-  pname = "xml2rfc";
-  version = "2.9.8";
-
-  buildInputs = [ intervaltree lxml requests pyflakes ];
-  propagatedBuildInputs = [ intervaltree lxml requests six ];
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b50ce2f98bc431cadbcef0523213497049b78c2829ee81c399976f1e4832afc6";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = "https://xml2rfc.tools.ietf.org/";
-    license = licenses.bsdOriginal;
-    description = "Xml2rfc generates RFCs and IETF drafts from document source in XML according to the dtd in RFC2629.";
-    maintainers = [ maintainers.yrashk ];
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd3bc17f4f0..b3df755dc93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24803,7 +24803,7 @@ in
 
   diceware = callPackage ../tools/security/diceware { };
 
-  xml2rfc = callPackage ../tools/typesetting/xml2rfc { };
+  xml2rfc = with python3Packages; toPythonApplication xml2rfc;
 
   mmark = callPackage ../tools/typesetting/mmark { };