diff --git a/var/spack/repos/builtin/packages/caffe/package.py b/var/spack/repos/builtin/packages/caffe/package.py
index 24bbe1ec6a114cef7b9101ced7f29f5c11c9d5f5..5d83b8e1a7003210ccac4048f42773d2f850ca90 100644
--- a/var/spack/repos/builtin/packages/caffe/package.py
+++ b/var/spack/repos/builtin/packages/caffe/package.py
@@ -31,9 +31,13 @@ class Caffe(CMakePackage):
        Center (BVLC) and by community contributors."""
 
     homepage = "http://caffe.berkeleyvision.org"
-    url      = "https://github.com/BVLC/caffe/archive/rc5.tar.gz"
+    url      = "https://github.com/BVLC/caffe/archive/1.0.tar.gz"
 
+    version('1.0', '5fbb0e32e7cd8de3de46e6fe6e4cd2b5')
     version('rc5', '692bd3580b7576485cde6b1e03eb5a6d')
+    version('rc4', 'd86eeb38b1400097d32ffcabdec75b55')
+    version('rc3', '84e39223115753b48312a8bf48c31f59')
+    version('rc2', 'c331932e34b5e2f5022fcc34c419080f')
 
     variant('gpu', default=False,
             description='Builds with support for GPUs via CUDA and cuDNN')
diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py
index 14eaf3739e6fc88dbe958924310f67fa70593ed1..0a073b837a9aeaf0349d060f457aab9a5bc4602f 100644
--- a/var/spack/repos/builtin/packages/protobuf/package.py
+++ b/var/spack/repos/builtin/packages/protobuf/package.py
@@ -41,6 +41,8 @@ class Protobuf(AutotoolsPackage):
     depends_on('libtool',  type='build')
     depends_on('m4',       type='build')
 
+    conflicts('%gcc@:4.6')  # Requires c++11
+
     variant('shared', default=True, description='Build shared libraries.')
 
     def configure_args(self):