diff --git a/checkin_notes b/checkin_notes
index 85803d3894..916d30fde0 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -3765,3 +3765,15 @@ David  23 Jun 2011
         client_types.cpp,h
         client_state.cpp
         cpu_sched.cpp
+
+David  23 Jun 2011
+    - client: replace <ignore_cuda_dev> with <ignore_nvidia_dev>
+        in cc_config.xml (but keep old one for compat)
+
+    lib/
+        coproc.h
+        cc_config.cpp,h
+    client/
+        client_state.cpp
+        coproc_detect.cpp
+        log_flags.cpp
diff --git a/client/client_state.cpp b/client/client_state.cpp
index 144bc69e25..00ed487713 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -339,7 +339,7 @@ int CLIENT_STATE::init() {
         vector<string> warnings;
         coprocs.get(
             config.use_all_gpus, descs, warnings,
-            config.ignore_cuda_dev, config.ignore_ati_dev
+            config.ignore_nvidia_dev, config.ignore_ati_dev
         );
         for (i=0; i<descs.size(); i++) {
             msg_printf(NULL, MSG_INFO, descs[i].c_str());
diff --git a/client/coproc_detect.cpp b/client/coproc_detect.cpp
index a4641ce8fb..b0c05bc236 100644
--- a/client/coproc_detect.cpp
+++ b/client/coproc_detect.cpp
@@ -267,7 +267,7 @@ void COPROCS::get_opencl(bool use_all, vector<string>&warnings) {
     if (nvidia.have_cuda) { // If CUDA already found the "best" NVIDIA GPU
         for (i=0; i<nvidia_opencls.size(); i++) {
             if (nvidia.matches(nvidia_opencls[i])) {
-                // TODO: how do we exclude those listed by config.ignore_cuda_dev ??
+                // TODO: how do we exclude those listed by config.ignore_nvidia_dev ??
                 nvidia.opencl_prop = nvidia_opencls[i];
                 nvidia.opencl_device_ids[nvidia.opencl_device_count++] = nvidia_opencls[i].device_id;
                 nvidia.have_opencl = true;
diff --git a/client/log_flags.cpp b/client/log_flags.cpp
index 5e64575bf4..00ca71980b 100644
--- a/client/log_flags.cpp
+++ b/client/log_flags.cpp
@@ -139,7 +139,7 @@ void CONFIG::show() {
     if (fetch_minimal_work) {
         msg_printf(NULL, MSG_INFO, "Config: fetch minimal work");
     }
-    show_gpu_ignore(ignore_cuda_dev, "NVIDIA");
+    show_gpu_ignore(ignore_nvidia_dev, "NVIDIA");
     show_gpu_ignore(ignore_ati_dev, "ATI");
     for (i=0; i<exclusive_apps.size(); i++) {
         msg_printf(NULL, MSG_INFO,
@@ -190,7 +190,7 @@ int CONFIG::parse_options_client(XML_PARSER& xp) {
     alt_platforms.clear();
     exclusive_apps.clear();
     exclusive_gpu_apps.clear();
-    ignore_cuda_dev.clear();
+    ignore_nvidia_dev.clear();
     ignore_ati_dev.clear();
 
     while (!xp.get(tag, sizeof(tag), is_tag)) {
@@ -272,8 +272,8 @@ int CONFIG::parse_options_client(XML_PARSER& xp) {
             continue;
         }
         if (xp.parse_bool(tag, "http_1_0", http_1_0)) continue;
-        if (xp.parse_int(tag, "ignore_cuda_dev", n)) {
-            ignore_cuda_dev.push_back(n);
+        if (xp.parse_int(tag, "ignore_cuda_dev", n)||xp.parse_int(tag, "ignore_nvidia_dev", n)) {
+            ignore_nvidia_dev.push_back(n);
             continue;
         }
         if (xp.parse_int(tag, "ignore_ati_dev", n)) {
diff --git a/lib/cc_config.cpp b/lib/cc_config.cpp
index b4c82a2ff1..88617ba399 100644
--- a/lib/cc_config.cpp
+++ b/lib/cc_config.cpp
@@ -204,7 +204,7 @@ void CONFIG::defaults() {
     http_1_0 = false;
     http_transfer_timeout = 300;
     http_transfer_timeout_bps = 10;
-    ignore_cuda_dev.clear();
+    ignore_nvidia_dev.clear();
     ignore_ati_dev.clear();
     max_file_xfers = 8;
     max_file_xfers_per_project = 2;
@@ -270,7 +270,7 @@ int CONFIG::parse_options(XML_PARSER& xp) {
     alt_platforms.clear();
     exclusive_apps.clear();
     exclusive_gpu_apps.clear();
-    ignore_cuda_dev.clear();
+    ignore_nvidia_dev.clear();
     ignore_ati_dev.clear();
 
     while (!xp.get(tag, sizeof(tag), is_tag)) {
@@ -345,8 +345,8 @@ int CONFIG::parse_options(XML_PARSER& xp) {
         if (xp.parse_bool(tag, "http_1_0", http_1_0)) continue;
         if (xp.parse_int(tag, "http_transfer_timeout", http_transfer_timeout)) continue;
         if (xp.parse_int(tag, "http_transfer_timeout_bps", http_transfer_timeout_bps)) continue;
-        if (xp.parse_int(tag, "ignore_cuda_dev", n)) {
-            ignore_cuda_dev.push_back(n);
+        if (xp.parse_int(tag, "ignore_cuda_dev", n) || xp.parse_int(tag, "ignore_nvidia_dev", n)) {
+            ignore_nvidia_dev.push_back(n);
             continue;
         }
         if (xp.parse_int(tag, "ignore_ati_dev", n)) {
@@ -519,10 +519,10 @@ int CONFIG::write(MIOFILE& out, LOG_FLAGS& log_flags) {
         http_transfer_timeout_bps
     );
         
-    for (i=0; i<ignore_cuda_dev.size(); ++i) {
+    for (i=0; i<ignore_nvidia_dev.size(); ++i) {
         out.printf(
-            "        <ignore_cuda_dev>%d</ignore_cuda_dev>\n",
-            ignore_cuda_dev[i]
+            "        <ignore_nvidia_dev>%d</ignore_nvidia_dev>\n",
+            ignore_nvidia_dev[i]
         );
     }
 
diff --git a/lib/cc_config.h b/lib/cc_config.h
index 48b09e862c..807ad2e980 100644
--- a/lib/cc_config.h
+++ b/lib/cc_config.h
@@ -138,8 +138,8 @@ struct CONFIG {
     bool http_1_0;
     int http_transfer_timeout_bps;
     int http_transfer_timeout;
-    std::vector<int> ignore_cuda_dev;
     std::vector<int> ignore_ati_dev;
+    std::vector<int> ignore_nvidia_dev;
     int max_file_xfers;
     int max_file_xfers_per_project;
     int max_stderr_file_size;
diff --git a/lib/coproc.h b/lib/coproc.h
index 89371c6c0f..f0c6e7643b 100644
--- a/lib/coproc.h
+++ b/lib/coproc.h
@@ -309,7 +309,7 @@ struct COPROCS {
     void get(
         bool use_all, std::vector<std::string> &descs,
         std::vector<std::string> &warnings,
-        std::vector<int>& ignore_cuda_dev,
+        std::vector<int>& ignore_nvidia_dev,
         std::vector<int>& ignore_ati_dev
     );
     void get_opencl(bool use_all, std::vector<std::string> &warnings);