diff --git a/pkgs/applications/misc/ssh-tools/default.nix b/pkgs/applications/misc/ssh-tools/default.nix
new file mode 100644
index 00000000000..8740633262f
--- /dev/null
+++ b/pkgs/applications/misc/ssh-tools/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "ssh-tools";
+  version = "1.6";
+
+  src = fetchFromGitHub {
+    owner = "vaporup";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0m0x9383p9ab4hdirncmrfha130iasa0v4cbif2y5nbxnxgh101r";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ssh-* $out/bin/
+  '';
+
+  meta = with lib; {
+    description = "Collection of various tools using ssh";
+    homepage = "https://github.com/vaporup/ssh-tools/";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 698ec43fcdc..f8c4846b102 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29389,6 +29389,8 @@ in
 
   ssh-audit = callPackage ../tools/security/ssh-audit { };
 
+  ssh-tools = callPackage ../applications/misc/ssh-tools { };
+
   auto-cpufreq = callPackage ../tools/system/auto-cpufreq {  };
 
   thermald = callPackage ../tools/system/thermald { };