diff --git a/checkin_notes b/checkin_notes
index b423284dc9..bf07b9ce83 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1134,3 +1134,15 @@ David  24 Feb 2011
 
     samples/wrapper/
         wrapper.cpp
+
+David  24 Feb 2011
+    - client: remove auto update stuff from makefiles.
+        This feature is mothballed.
+
+    client/
+        client_state.cpp,h
+        scheduler_op.cpp,h
+        file_names.cpp
+        cs_scheduler.cpp
+        cs_statefile
+        Makefile.am
diff --git a/client/Makefile.am b/client/Makefile.am
index 84eaa0cf41..20b119499f 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -37,7 +37,6 @@ boinc_client_SOURCES = \
     app_control.cpp \
     app_graphics.cpp \
     app_start.cpp \
-    auto_update.cpp \
     check_state.cpp \
     client_msgs.cpp \
     client_state.cpp \
diff --git a/client/client_state.cpp b/client/client_state.cpp
index bbe8c961ec..34466a63ac 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -541,7 +541,9 @@ int CLIENT_STATE::init() {
         all_projects_list_check_time = 0;
     }
 
+#ifdef ENABLE_AUTO_UPDATE
     auto_update.init();
+#endif
 
     http_ops->cleanup_temp_files();
 
@@ -792,7 +794,9 @@ bool CLIENT_STATE::poll_slow_events() {
     // and handle_finished_apps() must be done before schedule_cpus()
 
     check_project_timeout();
-    //auto_update.poll();
+#ifdef ENABLE_AUTO_UPDATE
+    auto_update.poll();
+#endif
     POLL_ACTION(active_tasks           , active_tasks.poll      );
     POLL_ACTION(garbage_collect        , garbage_collect        );
     POLL_ACTION(gui_http               , gui_http.poll          );
@@ -1199,6 +1203,7 @@ bool CLIENT_STATE::garbage_collect_always() {
         }
     }
 
+#ifdef ENABLE_AUTO_UPDATE
     // reference-count auto update files
     //
     if (auto_update.present) {
@@ -1206,6 +1211,7 @@ bool CLIENT_STATE::garbage_collect_always() {
             auto_update.file_refs[i].file_info->ref_cnt++;
         }
     }
+#endif
 
     // Scan through RESULTs.
     // delete RESULTs that have been reported and acked.
diff --git a/client/client_state.h b/client/client_state.h
index c89d7df98a..dc2dddcb40 100644
--- a/client/client_state.h
+++ b/client/client_state.h
@@ -84,7 +84,9 @@ struct CLIENT_STATE {
     GUI_RPC_CONN_SET gui_rpcs;
 #endif
     GUI_HTTP gui_http;
+#ifdef ENABLE_AUTO_UPDATE
     AUTO_UPDATE auto_update;
+#endif
     LOOKUP_WEBSITE_OP lookup_website_op;
     GET_CURRENT_VERSION_OP get_current_version_op;
     GET_PROJECT_LIST_OP get_project_list_op;
diff --git a/client/cs_scheduler.cpp b/client/cs_scheduler.cpp
index a5233f84a8..9016fb3c4d 100644
--- a/client/cs_scheduler.cpp
+++ b/client/cs_scheduler.cpp
@@ -979,11 +979,13 @@ int CLIENT_STATE::handle_scheduler_reply(PROJECT* project, char* scheduler_url)
         project->rpc_seqno = 0;
     }
 
+#ifdef ENABLE_AUTO_UPDATE
     if (sr.auto_update.present) {
         if (!sr.auto_update.validate_and_link(project)) {
             auto_update = sr.auto_update;
         }
     }
+#endif
 
     project->link_project_files(true);
 
diff --git a/client/cs_statefile.cpp b/client/cs_statefile.cpp
index bccdd32558..c0c09bfbad 100644
--- a/client/cs_statefile.cpp
+++ b/client/cs_statefile.cpp
@@ -485,7 +485,7 @@ int CLIENT_STATE::parse_state_file_aux(const char* fname) {
         if (parse_str(buf, "<newer_version>", newer_version)) {
             continue;
         }
-#ifndef SIM
+#ifdef ENABLE_AUTO_UPDATE
         if (match_tag(buf, "<auto_update>")) {
             if (!project) {
                 msg_printf(NULL, MSG_INTERNAL_ERROR,
@@ -706,9 +706,11 @@ int CLIENT_STATE::write_state(MIOFILE& f) {
             if (results[i]->project == p) results[i]->write(f, false);
         }
         p->write_project_files(f);
+#ifdef ENABLE_AUTO_UPDATE
         if (auto_update.present && auto_update.project==p) {
             auto_update.write(f);
         }
+#endif
     }
     active_tasks.write(f);
     f.printf(
diff --git a/client/file_names.cpp b/client/file_names.cpp
index c3012ad247..7e5ff887b4 100644
--- a/client/file_names.cpp
+++ b/client/file_names.cpp
@@ -79,11 +79,15 @@ void get_pathname(FILE_INFO* fip, char* path, int len) {
     // an associated PROJECT.
     //
     if (p) {
+#ifdef ENABLE_AUTO_UPDATE
         if (fip->is_auto_update_file) {
             boinc_version_dir(*p, gstate.auto_update.version, buf);
         } else {
             get_project_dir(p, buf, sizeof(buf));
         }
+#else
+        get_project_dir(p, buf, sizeof(buf));
+#endif
         snprintf(path, len, "%s/%s", buf, fip->name);
     } else {
         strlcpy(path, fip->name, len);
diff --git a/client/scheduler_op.cpp b/client/scheduler_op.cpp
index bfb8ee197a..2314d46b36 100644
--- a/client/scheduler_op.cpp
+++ b/client/scheduler_op.cpp
@@ -42,8 +42,6 @@
 #include "main.h"
 #include "scheduler_op.h"
 
-//#define ENABLE_AUTO_UPDATE
-
 using std::vector;
 
 SCHEDULER_OP::SCHEDULER_OP(HTTP_OP_SET* h) {
diff --git a/client/scheduler_op.h b/client/scheduler_op.h
index 955f38a0fb..2d82071796 100644
--- a/client/scheduler_op.h
+++ b/client/scheduler_op.h
@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "client_types.h"
-#include "auto_update.h"
+//#include "auto_update.h"
 #include "http_curl.h"
 #include "prefs.h"
 
@@ -125,7 +125,9 @@ struct SCHEDULER_REPLY {
     int send_time_stats_log;
     int send_job_log;
     int scheduler_version;
+#ifdef ENABLE_AUTO_UPDATE
     AUTO_UPDATE auto_update;
+#endif
     double cpu_backoff;
     double cuda_backoff;
     double ati_backoff;