diff --git a/checkin_notes b/checkin_notes
index 3feeaaa091..a575594a3a 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -3537,7 +3537,7 @@ David  25 Apr 2012
             if (*pbuf == NULL)
         not
             if (pbuf == NULL)
-    - various code cleanups from 
+    - various code cleanups
     - Makefile.am: don't include clientgui/res; nothing to make there
 
     from Steffen Moeller
@@ -3551,3 +3551,10 @@ David  25 Apr 2012
     client/
         coproc_detect.cpp
         client_types.cpp
+
+David  26 Apr 2012
+    - client: enforce <no_gpus> in config file not just at startup,
+        but also when config file is re-read.
+
+    client/
+        log_flags.cpp
diff --git a/client/log_flags.cpp b/client/log_flags.cpp
index f64c333f3b..23388b066c 100644
--- a/client/log_flags.cpp
+++ b/client/log_flags.cpp
@@ -562,6 +562,7 @@ void process_gpu_exclusions() {
 }
 
 bool gpu_excluded(APP* app, COPROC& cp, int ind) {
+    if (config.no_gpus) return true;
     PROJECT* p = app->project;
     for (unsigned int i=0; i<config.exclude_gpus.size(); i++) {
         EXCLUDE_GPU& eg = config.exclude_gpus[i];