diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index a313a566c4e8..b206fc671b5a 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -100,4 +100,6 @@ rec {
   gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
 
   git-extras = callPackage ./git-extras { };
+
+  git-cola = callPackage ./git-cola { };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
new file mode 100644
index 000000000000..eee17911cea8
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, python, pythonPackages, makeWrapper, gettext }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "git-cola-${version}";
+  version = "2.1.1";
+
+  src = fetchurl {
+    url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz";
+    sha256 = "0fpi5nvhyqkx67ak5pfcpgxbc3m19dqlvdh2c9igv2j0vp5rzkj1";
+  };
+
+  buildInputs = [ makeWrapper gettext ];
+  propagatedBuildInputs = with pythonPackages; [ pyqt4 sip pyinotify ];
+
+  # HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but
+  # "import __future__" must be placed above that. This removes the argv[0] line.
+  postFixup = ''
+    wrapPythonPrograms
+
+    sed -i "$out/bin/.git-dag-wrapped" -e '{
+      /import sys; sys.argv/d
+    }'
+    
+    sed -i "$out/bin/.git-cola-wrapped" -e '{
+      /import sys; sys.argv/d
+    }'
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/git-cola/git-cola;
+    description = "A sleek and powerful Git GUI";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bobvanderlinden ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96bb846c8d04..f1d88f67d083 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10421,6 +10421,7 @@ let
     pythonSupport = false;
   };
   gitSVN = gitAndTools.gitSVN;
+  git-cola = gitAndTools.git-cola;
 
   gitRepo = callPackage ../applications/version-management/git-repo {
     python = python27;