diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index bc2629513a55..e38c37360f09 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -1,39 +1,34 @@
-{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, mariadb, libmemcached, pcre
+{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre
 , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c
-, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog
+, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, krb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
-, libxslt, ocaml, freetype, gdb
+, libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
+, libvpx, imagemagick, fribidi
 }:
 
 stdenv.mkDerivation rec {
   name    = "hhvm-${version}";
-  version = "3.3.0";
+  version = "3.6.0";
 
   # use git version since we need submodules
   src = fetchgit {
     url    = "https://github.com/facebook/hhvm.git";
-    rev    = "e0c98e21167b425dddf1fc9efe78c9f7a36db268";
-    sha256 = "0s32v713xgf4iim1zb9sg08sg1r1fs49czar3jxajsi0dwc0lkj9";
+    rev    = "6ef13f20da20993dc8bab9eb103f73568618d3e8";
+    sha256 = "29a2d4b56cfd348b199d8f90b4e4b07de85dfb2ef1538479cd1e84f5bc1fbf96";
     fetchSubmodules = true;
   };
 
-  patches = [
-    ./3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch
-    ./8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch
-  ];
-
   buildInputs =
-    [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb
+    [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl
       libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
       oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
-      libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml
+      libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml krb5
+      gmp libyaml libedit libvpx imagemagick fribidi
     ];
 
   enableParallelBuilding = true;
   dontUseCmakeBuildDir = true;
-  dontUseCmakeConfigure = true;
   NIX_LDFLAGS = "-lpam -L${pam}/lib";
-  USE_HHVM=1;
   MYSQL_INCLUDE_DIR="${mariadb}/include/mysql";
   MYSQL_DIR=mariadb;
 
@@ -46,19 +41,8 @@ stdenv.mkDerivation rec {
     substituteInPlace ./configure \
       --replace "/usr/bin/env bash" ${stdenv.shell}
   '';
-  installPhase = ''
-    mkdir -p $out/bin $out/lib
-    mv hphp/hhvm/hhvm          $out/bin
-    mv hphp/hack/bin/hh_server $out/bin
-    mv hphp/hack/bin/hh_client $out/bin
-    mv hphp/hack/hhi           $out/lib/hack-hhi
 
-    cat > $out/bin/hhvm-hhi-copy <<EOF
-    #!${stdenv.shell}
-    cp -R $out/lib/hack-hhi \$1
-    EOF
-    chmod +x $out/bin/hhvm-hhi-copy
-  '';
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
 
   meta = {
     description = "High-performance JIT compiler for PHP/Hack";