diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
new file mode 100644
index 000000000000..d45fdc8e12d6
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "kakoune-nightly-${version}";
+  version = "2016-07-26";
+  src = fetchFromGitHub {
+    repo = "kakoune";
+    owner = "mawww";
+    rev = "0d2c5072b083a893843e4fa87f9f702979069e14";
+    sha256 = "01qqs5yr9xvvklg3gg45lgnyh6gji28m854mi1snzvjd7fksf50n";
+  };
+  buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];
+
+  buildPhase = ''
+    sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' src/Makefile
+    export PREFIX=$out
+    (cd src && make )
+  '';
+
+  installPhase = ''
+    (cd src && make install)
+  '';
+
+  meta = {
+    homepage = http://kakoune.org/;
+    description = "A vim inspired text editor";
+    license = licenses.publicDomain;
+    maintainers = with maintainers; [ vrthra ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9fb85ebe6c4..a611bc40e5c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2180,6 +2180,8 @@ in
 
   kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { };
 
+  kakoune = callPackage ../applications/editors/kakoune { };
+
   kbdd = callPackage ../applications/window-managers/kbdd { };
 
   kdbplus = callPackage_i686 ../applications/misc/kdbplus { };