diff --git a/checkin_notes b/checkin_notes
index 4dcf0ec4f3..a5faa8f1ac 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8981,3 +8981,9 @@ David  9 Nov 2009
         cs_cmdline.cpp
         cs_scheduler.cpp
         sysmon_win.cpp
+
+David  9 Nov 2009
+    - client: add --no_gpus cmdline option
+
+    client/
+        cs_cmdline.cpp
diff --git a/client/cs_cmdline.cpp b/client/cs_cmdline.cpp
index aed2184fee..1756437e0c 100644
--- a/client/cs_cmdline.cpp
+++ b/client/cs_cmdline.cpp
@@ -178,6 +178,8 @@ void CLIENT_STATE::parse_cmdline(int argc, char** argv) {
         } else if (ARG(master_fetch_retry_cap)) {
             if (i == argc-1) show_options = true;
             else master_fetch_retry_cap = atoi(argv[++i]);
+        } else if (ARG(no_gpus)) {
+            config.no_gpus = true;
         } else if (ARG(no_gui_rpc)) {
             no_gui_rpc = true;
         } else if (ARG(no_priority_change)) {