diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
new file mode 100644
index 000000000000..5fbb39431155
--- /dev/null
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoconf, automake110x, libtool, pkgconfig, zlib, openssl, libevent, ncurses, cmake, ruby }:
+
+stdenv.mkDerivation rec {
+  name = "tmate-${version}";
+  version = "1.8.10";
+
+  src = fetchFromGitHub {
+    owner  = "nviennot";
+    repo   = "tmate";
+    rev    = version;
+    sha256 = "1bd9mi8fx40608zlady9dbv21kbdwc3kqrgz012m529f6cbysmzc";
+  };
+
+  buildInputs = [ autoconf automake110x pkgconfig libtool zlib openssl libevent ncurses cmake ruby ];
+
+  dontUseCmakeConfigure=true;
+
+  preConfigure = "./autogen.sh";
+
+  meta = {
+    homepage = http://tmate.io/;
+    description = "Instant Terminal Sharing";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ DamienCassou ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acc88b59bc72..4c468f1e8e28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3202,6 +3202,8 @@ let
 
   tlsdate = callPackage ../tools/networking/tlsdate { };
 
+  tmate = callPackage ../tools/misc/tmate { };
+
   tmpwatch = callPackage ../tools/misc/tmpwatch  { };
 
   tmux = callPackage ../tools/misc/tmux { };