diff --git a/checkin_notes b/checkin_notes
index 77d0596ca6..cb0748eca5 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -18863,6 +18863,20 @@ David  25 Oct 2004
             forum_rate.php
             forum_thread.php
 
+David  25 Oct 2004
+    - add <active_task_state> and <vm_size> fields
+        to XML for active task (for GUI RPC)
+    - compile fixes for app graphics (from Bruce Allen and Reinhard Prix)
+
+    boincglut/
+        Makefile.am
+        include/
+            Makefile.am (new)
+    client/
+        app.C
+    lib/
+        gui_rpc_client.C,h
+
 David  26 Oct 2004
     - Fixed the following problem with graphics apps on Unix:
         - the worker timer handler (on_timer) was set up in boinc_init();
diff --git a/client/app.C b/client/app.C
index a120bf92f1..817938fed9 100644
--- a/client/app.C
+++ b/client/app.C
@@ -333,22 +333,26 @@ int ACTIVE_TASK::write(MIOFILE& fout) {
         "<active_task>\n"
         "    <project_master_url>%s</project_master_url>\n"
         "    <result_name>%s</result_name>\n"
+        "    <active_task_state>%d</active_task_state>\n"
         "    <app_version_num>%d</app_version_num>\n"
         "    <slot>%d</slot>\n"
         "    <scheduler_state>%d</scheduler_state>\n"
         "    <checkpoint_cpu_time>%f</checkpoint_cpu_time>\n"
         "    <fraction_done>%f</fraction_done>\n"
         "    <current_cpu_time>%f</current_cpu_time>\n"
+        "    <vm_size>%f</vm_size>\n"
         "%s"
         "</active_task>\n",
         result->project->master_url,
         result->name,
+        state,
         app_version->version_num,
         slot,
         scheduler_state,
         checkpoint_cpu_time,
         fraction_done,
         current_cpu_time,
+        vm_size,
         suspended_via_gui?"    <suspended_via_gui/>\n":""
     );
     return 0;
diff --git a/configure.ac b/configure.ac
index 611c67ba47..3d7f6dfec7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -216,9 +216,10 @@ AC_CONFIG_FILES([Makefile
                  RSAEuro/source/Makefile
                  RSAEuro/Makefile
                  api/Makefile
-		 boincglut/Makefile
-		 boincglut/lib/Makefile
-		 boincglut/lib/glut/Makefile
+                 boincglut/Makefile
+                 boincglut/lib/Makefile
+                 boincglut/lib/glut/Makefile
+                 boincglut/include/Makefile
                  apps/Makefile
                  client/Makefile
                  db/Makefile
diff --git a/doc/links.php b/doc/links.php
index feb1e85ddd..a71301f824 100644
--- a/doc/links.php
+++ b/doc/links.php
@@ -58,6 +58,11 @@ show_link(
     "Universe Examiners",
     "http://www.universe-examiners.org/boinc_faq.php"
 );
+show_link(
+    "Finnish",
+    "BOINC instructions in Finnish",
+    "http://news.universe-examiners.org/asennus/boinc.html"
+);
 show_link(
     "French",
     "www.boinc-fr.net",
diff --git a/lib/gui_rpc_client.C b/lib/gui_rpc_client.C
index bef90ffe14..d8a6baba14 100644
--- a/lib/gui_rpc_client.C
+++ b/lib/gui_rpc_client.C
@@ -315,6 +315,7 @@ int RESULT::parse(MIOFILE& in) {
         else if (parse_int(buf, "<app_version_num>", app_version_num)) continue;
         else if (parse_double(buf, "<checkpoint_cpu_time>", checkpoint_cpu_time)) continue;
         else if (parse_double(buf, "<current_cpu_time>", current_cpu_time)) continue;
+        else if (parse_double(buf, "<vm_size>", vm_size)) continue;
         else if (parse_double(buf, "<fraction_done>", fraction_done)) continue;
         else if (parse_double(buf, "<estimated_cpu_time_remaining>", estimated_cpu_time_remaining)) continue;
     }
@@ -336,6 +337,7 @@ void RESULT::print() {
     printf("   checkpoint CPU time: %f\n", checkpoint_cpu_time);
     printf("   current CPU time: %f\n", current_cpu_time);
     printf("   fraction done: %f\n", fraction_done);
+    printf("   VM size: %f\n", vm_size);
 }
 
 void RESULT::clear() {
diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h
index 4d1c22a309..f70a48cf73 100644
--- a/lib/gui_rpc_client.h
+++ b/lib/gui_rpc_client.h
@@ -135,14 +135,15 @@ public:
     int scheduler_state;
     int exit_status;
     int signal;
-    int active_task_state;
+    std::string stderr_out;
     // the following defined if active
     bool active_task;
-    std::string stderr_out;
+    int active_task_state;
     int app_version_num;
     double checkpoint_cpu_time;
     double current_cpu_time;
     double fraction_done;
+    double vm_size;
     double estimated_cpu_time_remaining;
     bool suspended_via_gui;