diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix
new file mode 100644
index 000000000000..b94ec8e429fa
--- /dev/null
+++ b/pkgs/tools/networking/polysh/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, python2Packages }:
+
+let
+  inherit (python2Packages) buildPythonApplication;
+in
+buildPythonApplication rec {
+  name = "polysh-${version}";
+  version = "0.4";
+  src = fetchurl {
+          url = "http://guichaz.free.fr/polysh/files/${name}.tar.bz2";
+          sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4";
+        };
+
+  meta = {
+    description = "A tool to aggregate several remote shells into one";
+    longDescription = ''
+      Polysh is a tool to aggregate several remote shells into one. It
+      is used to launch an interactive remote shell on many machines
+      at once.
+    '';
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    homepage = http://guichaz.free.fr/polysh/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 187e8de8e7c8..d8c427744e7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3330,6 +3330,8 @@ in
 
   polkit_gnome = callPackage ../tools/security/polkit-gnome { };
 
+  polysh = callPackage ../tools/networking/polysh { };
+
   ponysay = callPackage ../tools/misc/ponysay { };
 
   popfile = callPackage ../tools/text/popfile { };