--- a/x11-drivers/nvidia-drivers/nvidia-drivers-355.06.ebuild	
+++ a/x11-drivers/nvidia-drivers/nvidia-drivers-355.06.ebuild	
@@ -34,7 +34,7 @@ REQUIRED_USE="
 "
 
 COMMON="
-	app-eselect/eselect-opencl
+	>=app-eselect/eselect-opencl-1.1.0-r2
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9
@@ -288,6 +288,9 @@ src_install() {
 	if use kernel_linux; then
 		insinto /etc/OpenCL/vendors
 		doins ${NV_OBJ}/nvidia.icd
+
+		# OpenCL 1.2 headers for eselect-opencl
+		dosym ../../../global/include/CL-1.2 /usr/$(get_libdir)/OpenCL/vendors/nvidia/include/CL
 	fi
 
 	# Documentation