diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index aab229c0ad22..7bd79b308859 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -1,15 +1,28 @@
-{ stdenv, fetchurl, ncurses, libevent, pkgconfig }:
+{ stdenv, fetchFromGitHub, autoreconfHook, ncurses, libevent, pkgconfig }:
+
+let
+
+  bashCompletion = fetchFromGitHub {
+    owner = "przepompownia";
+    repo = "tmux-bash-completion";
+    rev = "678a27616b70c649c6701cae9cd8c92b58cc051b";
+    sha256 = "1d2myrh4xiay9brsxafb02pi922760sdkyyy5xjm4sfh4iimc4zf";
+  };
+
+in
 
 stdenv.mkDerivation rec {
   name = "tmux-${version}";
-  version = "2.1";
+  version = "2.2";
 
-  src = fetchurl {
-    url = "https://github.com/tmux/tmux/releases/download/${version}/${name}.tar.gz";
-    sha256 = "0xk1mylsb08sf0w597mdgj9s6hxxjvjvjd6bngpjvvxwyixlwmii";
+  src = fetchFromGitHub {
+    owner = "tmux";
+    repo = "tmux";
+    rev = version;
+    sha256 = "04k9yxjp357sdw6365z6qx87vmwygl3v3wpvd78pp63ky5hzbbay";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
 
   buildInputs = [ ncurses libevent ];
 
@@ -20,7 +33,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mkdir -p $out/etc/bash_completion.d
-    cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux
+    cp -v ${bashCompletion}/completions/tmux $out/etc/bash_completion.d/tmux
   '';
 
   meta = {
@@ -44,6 +57,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3;
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ thammers ];
+    maintainers = with stdenv.lib.maintainers; [ thammers fpletz ];
   };
 }