diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index fc7d9611529..9773c30d6d8 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -4,7 +4,7 @@
 , cudaSupport ? true
 , cudnnSupport ? false
 , cudnn ? null
-, cudatoolkit7
+, cudatoolkit
 , fetchFromGitHub
 , google-gflags
 , glog
@@ -19,29 +19,31 @@
 
 let optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
-  # Use git revision because latest "release" is really old
-  name = "caffe-git-2015-07-02";
+  name = "caffe-${version}";
+  version = "1.0-rc5";
 
   src = fetchFromGitHub {
     owner = "BVLC";
     repo = "caffe";
-    rev = "77d66dfc907dd875d69bb9fc12dd950b531e464f";
-    sha256 = "0vd4qrc49dhsawj298xpkd5mvi35sh56kdswx3yp8ya4fjajwakx";
+    rev = "rc5";
+    sha256 = "0lfmmc0n6xvkpygvxclzrvd0zigb4yfc5612anv2ahlxpfi9031c";
   };
 
   preConfigure = "mv Makefile.config.example Makefile.config";
 
-  makeFlags = "BLAS=open " +
-              (if !cudaSupport then "CPU_ONLY=1 " else "CUDA_DIR=${cudatoolkit7} ") +
-              (if cudnnSupport then "USE_CUDNN=1 " else "");
+  makeFlags = [ "BLAS=open"
+                (if !cudaSupport then "CPU_ONLY=1" else "CUDA_DIR=${cudatoolkit}") ]
+              ++ optional cudnnSupport "USE_CUDNN=1";
 
   # too many issues with tests to run them for now
   doCheck = false;
-  checkPhase = "make runtest ${makeFlags}";
+  checkTarget = "runtest";
+
+  enableParallelBuilding = true;
 
   buildInputs = [ openblas boost google-gflags glog hdf5 leveldb lmdb opencv
                   protobuf snappy ]
-                ++ optional cudaSupport cudatoolkit7
+                ++ optional cudaSupport cudatoolkit
                 ++ optional cudnnSupport cudnn;
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4324e76b668..e4d2adb19c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18456,8 +18456,10 @@ with pkgs;
 
   ### SCIENCE / MATH
 
-  caffe = callPackage ../applications/science/math/caffe {
+  caffe = callPackage ../applications/science/math/caffe rec {
     cudaSupport = config.caffe.cudaSupport or config.cudaSupport or true;
+    # CUDA 8 doesn't support GCC 6.
+    stdenv = if cudaSupport then overrideCC pkgs.stdenv gcc5 else pkgs.stdenv;
   };
 
   ecm = callPackage ../applications/science/math/ecm { };