diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 208445c3ec5c..2e2332f20f27 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -1,30 +1,22 @@
-{ stdenv, fetchgit, cmake, llvm, openssl, clang, writeScript, bash }:
+{ stdenv, fetchgit, cmake, llvmPackages, openssl, writeScript, bash, emacs }:
 
-let llvm-config-wrapper = writeScript "llvm-config" ''
-      #! ${bash}/bin/bash
-      if [[ "$1" = "--cxxflags" ]]; then
-        echo $(${llvm}/bin/llvm-config "$@") -isystem ${clang.cc}/include
-      else
-        ${llvm}/bin/llvm-config "$@"
-      fi
-    '';
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "rtags-${version}";
-  rev = "9fed420d20935faf55770765591fc2de02eeee28";
-  version = "${stdenv.lib.strings.substring 0 7 rev}";
+  version = "git-2016-04-29";
+  rev = "233543d343bf86fa31c35ee21242fa2da3a965ab";
 
-  buildInputs = [ cmake llvm openssl clang ];
+  buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ];
 
   preConfigure = ''
-    export LIBCLANG_LLVM_CONFIG_EXECUTABLE=${llvm-config-wrapper}
+    export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags)" \
+           LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
   '';
 
   src = fetchgit {
     inherit rev;
     fetchSubmodules = true;
     url = "https://github.com/andersbakken/rtags.git";
-    sha256 = "1sb6wfknhvrgirqp65paz7kihv4zgg8g5f7a7i14i10sysalxbif";
+    sha256 = "1jzmpbkx1z8dnpr0ndclb6c3dxnf90ifr8j1nzz4j8cvzdpc3lzc";
   };
 
   meta = {