diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
new file mode 100644
index 000000000000..9db6e4cb7364
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
@@ -0,0 +1,26 @@
+{ clangStdenv, fetchgit, llvm, clangUnwrapped }:
+
+clangStdenv.mkDerivation {
+  name = "emacs-clang-complete-async-20130218";
+  src = fetchgit {
+    url = "git://github.com/Golevka/emacs-clang-complete-async.git";
+    rev = "f01488971ec8b5752780d130fb84de0c16a46f31";
+    sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf";
+  };
+
+  buildInputs = [ llvm clangUnwrapped ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/emacs/site-lisp
+    install -m 755 clang-complete $out/bin
+    install -m 644 auto-complete-clang-async.el $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    homepage = "https://github.com/Golevka/emacs-clang-complete-async";
+    description = "An emacs plugin to complete C and C++ code using libclang";
+    license = "GPLv3+";
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2c6f85ef697..f85f88285232 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6896,6 +6896,8 @@ let
 
     jabber = callPackage ../applications/editors/emacs-modes/jabber { };
 
+    emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { };
+
     emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { };
 
     emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { };