diff --git a/client/app_start.cpp b/client/app_start.cpp
index 842391fcea..c88899a88e 100644
--- a/client/app_start.cpp
+++ b/client/app_start.cpp
@@ -188,7 +188,12 @@ void ACTIVE_TASK::init_app_init_data(APP_INIT_DATA& aid) {
     aid.release = BOINC_RELEASE;
     aid.app_version = app_version->version_num;
     safe_strcpy(aid.app_name, wup->app->name);
-    safe_strcpy(aid.plan_class, app_version->plan_class);
+    if (strlen(wup->plan_class)) {
+        // BUDA jobs
+        safe_strcpy(aid.plan_class, wup->plan_class);
+    } else {
+        safe_strcpy(aid.plan_class, app_version->plan_class);
+    }
     safe_strcpy(aid.symstore, project->symstore);
     safe_strcpy(aid.acct_mgr_url, gstate.acct_mgr_info.master_url);
     if (project->project_specific_prefs.length()) {
diff --git a/client/client_types.h b/client/client_types.h
index c10bd31773..98403ca689 100644
--- a/client/client_types.h
+++ b/client/client_types.h
@@ -409,6 +409,7 @@ struct WORKUNIT {
         // to versions before multi-platform support
     bool has_resource_usage;
     char plan_class[256];
+        // for BUDA jobs, the BUDA variant
     RESOURCE_USAGE resource_usage;
     std::string command_line;
     std::vector<FILE_REF> input_files;
diff --git a/client/result.h b/client/result.h
index 22b4e5a4a0..db160fb7b6 100644
--- a/client/result.h
+++ b/client/result.h
@@ -27,6 +27,7 @@ struct RESULT {
     double report_deadline;
     int version_num;        // identifies the app used
     char plan_class[64];
+        // used to associate this RESULT with an APP_VERSION
     char platform[256];
     APP_VERSION* avp;
     std::vector<FILE_REF> output_files;