diff --git a/client/gpu_detect.cpp b/client/gpu_detect.cpp
index 064b426f5d..276bea7f2c 100644
--- a/client/gpu_detect.cpp
+++ b/client/gpu_detect.cpp
@@ -18,7 +18,7 @@
 
 // client-specific GPU code.  Mostly GPU detection
 
-#define USE_CHILD_PROCESS_TO_DETECT_GPUS 1
+//#define USE_CHILD_PROCESS_TO_DETECT_GPUS 1
 
 #include "cpp.h"
 
@@ -246,6 +246,13 @@ void COPROCS::correlate_gpus(
         descs.push_back(string(buf));
     }
 
+    // Create descriptions for OpenCL CPUs
+    //
+    for (i=0; i<cpu_opencls.size(); i++) {
+        cpu_opencls[i].description(buf, sizeof(buf), proc_type_name(PROC_TYPE_CPU));
+        descs.push_back(string(buf));
+    }
+
     ati_gpus.clear();
     nvidia_gpus.clear();
     intel_gpus.clear();
diff --git a/client/gpu_opencl.cpp b/client/gpu_opencl.cpp
index 8e8572b88e..a5b5593163 100644
--- a/client/gpu_opencl.cpp
+++ b/client/gpu_opencl.cpp
@@ -107,6 +107,8 @@ static bool is_NVIDIA(char* vendor) {
 
 static bool is_intel(char* vendor) {
     if (strcasestr(vendor, "intel")) return true;
+    if (strcasestr(vendor, "GenuineIntel")) return true;
+    if (strcasestr(vendor, "Intel(R) Corporation")) return true;
     return false;
 }
 
diff --git a/lib/opencl_boinc.cpp b/lib/opencl_boinc.cpp
index d0c1134835..6b8c088799 100644
--- a/lib/opencl_boinc.cpp
+++ b/lib/opencl_boinc.cpp
@@ -312,3 +312,6 @@ int OPENCL_CPU_PROP::parse(XML_PARSER& xp) {
     return ERR_XML_PARSE;
 }
 
+void OPENCL_CPU_PROP::description(char* buf, int buflen, const char* type) {
+    opencl_prop.description(buf, buflen, type);
+}
diff --git a/lib/opencl_boinc.h b/lib/opencl_boinc.h
index 153c6517e7..63bf247fe9 100644
--- a/lib/opencl_boinc.h
+++ b/lib/opencl_boinc.h
@@ -84,7 +84,7 @@ struct OPENCL_CPU_PROP {
     void clear();
     void write_xml(MIOFILE&);
     int parse(XML_PARSER&);
-
+    void description(char* buf, int buflen, const char* type);
 };
 
 #endif