diff --git a/pkgs/development/python-modules/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix
similarity index 85%
rename from pkgs/development/python-modules/cve-bin-tool/default.nix
rename to pkgs/tools/security/cve-bin-tool/default.nix
index 61ae8976815e..fac922628752 100644
--- a/pkgs/development/python-modules/cve-bin-tool/default.nix
+++ b/pkgs/tools/security/cve-bin-tool/default.nix
@@ -1,5 +1,5 @@
 { lib
-, buildPythonPackage
+, buildPythonApplication
 , fetchFromGitHub
 , jsonschema
 , plotly
@@ -18,6 +18,7 @@
 , rich
 , aiohttp
 , toml
+, distro
   # aiohttp[speedups]
 , aiodns
 , brotlipy
@@ -25,15 +26,15 @@
 , pillow
 , pytestCheckHook
 }:
-buildPythonPackage {
+buildPythonApplication rec {
   pname = "cve-bin-tool";
-  version = "unstable-2021-04-15";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "cve-bin-tool";
-    rev = "10cb6fd0baffe35babfde024bc8c70aa58629237";
-    sha256 = "STf0tJBpadBqsbC+MghBai8zahDkrXfLoFRJ+84wvvY=";
+    rev = "v${version}";
+    sha256 = "087w7fsc4vd4sjz8ww6q71b108yhz94ydr76d99rhlmcqsq7fihs";
   };
 
   # Wants to open a sqlite database, access the internet, etc
@@ -57,7 +58,7 @@ buildPythonPackage {
     rich
     aiohttp
     toml
-
+    distro
     # aiohttp[speedups]
     aiodns
     brotlipy
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2374b9c13c4..d8d543068fda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4168,6 +4168,8 @@ with pkgs;
 
   cwebbin = callPackage ../development/tools/misc/cwebbin { };
 
+  cve-bin-tool = python3Packages.callPackage ../tools/security/cve-bin-tool { };
+
   cvs-fast-export = callPackage ../applications/version-management/cvs-fast-export { };
 
   dadadodo = callPackage ../tools/text/dadadodo { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 934e2d87f780..c22a4c18860d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1770,8 +1770,6 @@ in {
 
   curve25519-donna = callPackage ../development/python-modules/curve25519-donna { };
 
-  cve-bin-tool = callPackage ../development/python-modules/cve-bin-tool { };
-
   cvxopt = callPackage ../development/python-modules/cvxopt { };
 
   cvxpy = callPackage ../development/python-modules/cvxpy { };