diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 5c0846fdc96..4f45db810e2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -236,6 +236,7 @@
   sprock = "Roger Mason <rmason@mun.ca>";
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
+  szczyp = "Szczyp <qb@szczyp.com>";
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
   taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
diff --git a/pkgs/development/tools/rhc/Gemfile b/pkgs/development/tools/rhc/Gemfile
new file mode 100644
index 00000000000..ad167c7422f
--- /dev/null
+++ b/pkgs/development/tools/rhc/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'rhc'
diff --git a/pkgs/development/tools/rhc/Gemfile.lock b/pkgs/development/tools/rhc/Gemfile.lock
new file mode 100644
index 00000000000..83fa877550d
--- /dev/null
+++ b/pkgs/development/tools/rhc/Gemfile.lock
@@ -0,0 +1,35 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    commander (4.2.1)
+      highline (~> 1.6.11)
+    highline (1.6.21)
+    httpclient (2.6.0.1)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    net-ssh-multi (1.2.1)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    open4 (1.3.4)
+    rhc (1.36.4)
+      archive-tar-minitar
+      commander (>= 4.0, < 4.3.0)
+      highline (~> 1.6.11)
+      httpclient (>= 2.4.0)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.0.11, < 2.9.3)
+      net-ssh-multi (>= 1.2.0)
+      open4
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rhc
+
+BUNDLED WITH
+   1.10.5
diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix
new file mode 100644
index 00000000000..e9efdb9f423
--- /dev/null
+++ b/pkgs/development/tools/rhc/default.nix
@@ -0,0 +1,17 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv {
+  name = "rhc-1.36.4";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    homepage = https://github.com/openshift/rhc;
+    description = "OpenShift client tools";
+    license = licenses.asl20;
+    maintaners = maintainers.szczyp;
+  };
+}
diff --git a/pkgs/development/tools/rhc/gemset.nix b/pkgs/development/tools/rhc/gemset.nix
new file mode 100644
index 00000000000..6b273396890
--- /dev/null
+++ b/pkgs/development/tools/rhc/gemset.nix
@@ -0,0 +1,95 @@
+{
+  "archive-tar-minitar" = {
+    version = "0.5.2";
+    source = {
+      type = "gem";
+      sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig";
+    };
+  };
+  "commander" = {
+    version = "4.2.1";
+    source = {
+      type = "gem";
+      sha256 = "1zwfhswnbhwv0zzj2b3s0qvpqijbbnmh7zvq6v0274rqbxyf1jwc";
+    };
+    dependencies = [
+      "highline"
+    ];
+  };
+  "highline" = {
+    version = "1.6.21";
+    source = {
+      type = "gem";
+      sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
+    };
+  };
+  "httpclient" = {
+    version = "2.6.0.1";
+    source = {
+      type = "gem";
+      sha256 = "0haz4s9xnzr73mkfpgabspj43bhfm9znmpmgdk74n6gih1xlrx1l";
+    };
+  };
+  "net-scp" = {
+    version = "1.2.1";
+    source = {
+      type = "gem";
+      sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
+    };
+    dependencies = [
+      "net-ssh"
+    ];
+  };
+  "net-ssh" = {
+    version = "2.9.2";
+    source = {
+      type = "gem";
+      sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r";
+    };
+  };
+  "net-ssh-gateway" = {
+    version = "1.2.0";
+    source = {
+      type = "gem";
+      sha256 = "1nqkj4wnj26r81rp3g4jqk7bkd2nqzjil3c9xqwchi0fsbwv2niy";
+    };
+    dependencies = [
+      "net-ssh"
+    ];
+  };
+  "net-ssh-multi" = {
+    version = "1.2.1";
+    source = {
+      type = "gem";
+      sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71";
+    };
+    dependencies = [
+      "net-ssh"
+      "net-ssh-gateway"
+    ];
+  };
+  "open4" = {
+    version = "1.3.4";
+    source = {
+      type = "gem";
+      sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1";
+    };
+  };
+  "rhc" = {
+    version = "1.36.4";
+    source = {
+      type = "gem";
+      sha256 = "1dkg39x3y3sxq71md5c8akq4y7ynjwcdy8ysm6d1k9b2rj0s5wdb";
+    };
+    dependencies = [
+      "archive-tar-minitar"
+      "commander"
+      "highline"
+      "httpclient"
+      "net-scp"
+      "net-ssh"
+      "net-ssh-multi"
+      "open4"
+    ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e34e61cebf..13a2ad7e746 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5734,6 +5734,8 @@ let
 
   remake = callPackage ../development/tools/build-managers/remake { };
 
+  rhc = callPackage ../development/tools/rhc { };
+
   rman = callPackage ../development/tools/misc/rman { };
 
   rr = callPackage ../development/tools/analysis/rr { };